Etikett ver 6.8.14 zum Änderungssatz 358ff080b42e hinzugefügt

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

@@ -23,6 +23,26 @@ You can monitor trading fees, dividends and sales profits.
 Changes
 =======
 
+*6.8.14 - 19.01.2024*
+
+- the amounts of the view cash books now include the amounts
+  of the generic cash books
+
+
+*6.8.13 - 03.01.2024*
+
+- fix: sorting/searcher of field yield-balance
+
+*6.8.12 - 31.12.2023*
+
+- remove caching
+- add worker-based precalculation of cashbook-values
+- add columns to cashbook list/tree view
+
+*6.8.11 - 06.12.2023*
+
+- add: columns optional
+
 *6.8.10 - 08.06.2023*
 
 - compatibility to Tryton 6.8

__init__.py

@@ -11,6 +11,7 @@ from .line import Line
 from .splitline import SplitLine
 from .assetsetting import AssetSetting
 from .asset import AssetRate
+from .valuestore import ValueStore
 
 
 def register():
@@ -22,4 +23,5 @@ def register():
         SplitLine,
         Reconciliation,
         AssetSetting,
+        ValueStore,
         module='cashbook_investment', type_='model')

asset.py

@@ -3,8 +3,7 @@
 # The COPYRIGHT file at the top level of this repository contains the
 # full copyright notices and license terms.
 
-from trytond.pool import Pool, PoolMeta
-CACHEKEY_ASSETRATE = 'assetrate-%s'
+from trytond.pool import PoolMeta, Pool
 
 
 class AssetRate(metaclass=PoolMeta):
@@ -14,34 +13,52 @@ class AssetRate(metaclass=PoolMeta):
     def create(cls, vlist):
         """ update cache-value
         """
-        MemCache = Pool().get('cashbook.memcache')
+        pool = Pool()
+        Cashbook = pool.get('cashbook.book')
+        ValueStore = pool.get('cashbook.values')
 
         records = super(AssetRate, cls).create(vlist)
-        for rate in records:
-            MemCache.record_update(CACHEKEY_ASSETRATE % rate.asset.id, rate)
+
+        ValueStore.update_books(
+            ValueStore.get_book_by_books(
+                Cashbook.search([
+                    ('asset', 'in', [
+                        x.asset.id for x in records])])))
         return records
 
     @classmethod
     def write(cls, *args):
         """ update cache-value
         """
-        MemCache = Pool().get('cashbook.memcache')
+        pool = Pool()
+        Cashbook = pool.get('cashbook.book')
+        ValueStore = pool.get('cashbook.values')
+
+        actions = iter(args)
+        all_rates = []
+        for rates, values in zip(actions, actions):
+            all_rates.extend(rates)
 
         super(AssetRate, cls).write(*args)
 
-        actions = iter(args)
-        for rates, values in zip(actions, actions):
-            for rate in rates:
-                MemCache.record_update(CACHEKEY_ASSETRATE % rate.asset.id, rate)
+        ValueStore.update_books(
+            ValueStore.get_book_by_books(
+                Cashbook.search([
+                    ('asset', 'in', [
+                        x.asset.id for x in all_rates])])))
 
     @classmethod
     def delete(cls, records):
         """ set cache to None
         """
-        MemCache = Pool().get('cashbook.memcache')
+        pool = Pool()
+        Cashbook = pool.get('cashbook.book')
+        ValueStore = pool.get('cashbook.values')
+
+        books = ValueStore.get_book_by_books(Cashbook.search([
+            ('asset', 'in', [x.asset.id for x in records])]))
 
-        for record in records:
-            MemCache.record_update(CACHEKEY_ASSETRATE % record.asset.id, None)
         super(AssetRate, cls).delete(records)
+        ValueStore.update_books(books)
 
 # end

assetsetting.py

@@ -5,7 +5,6 @@
 
 
 from trytond.model import ModelSingleton, ModelView, ModelSQL, fields
-from trytond.pool import Pool
 
 
 class AssetSetting(ModelSingleton, ModelSQL, ModelView):
@@ -25,13 +24,4 @@ class AssetSetting(ModelSingleton, ModelSQL, ModelView):
         model_name='cashbook.book', ondelete='RESTRICT',
         help='Profit and loss on sale of assets are recorded in the cash book.')
 
-    @classmethod
-    def write(cls, *args):
-        """ clear cache-values
-        """
-        MemCache = Pool().get('cashbook.memcache')
-
-        MemCache._cashbook_value_cache.clear_all()
-        super(AssetSetting, cls).write(*args)
-
 # end AssetSetting

line.py

@@ -14,21 +14,19 @@ from trytond.i18n import gettext
 from trytond.report import Report
 from trytond.transaction import Transaction
 from trytond.modules.cashbook.line import STATES, DEPENDS
+from trytond.modules.cashbook.const import DEF_NONE
 from .mixin import SecondUomMixin
 
 STATESQ1 = {
     'invisible': And(
         Eval('feature', '') != 'asset',
-        Eval('booktransf_feature', '') != 'asset',
-        ),
+        Eval('booktransf_feature', '') != 'asset'),
     'required': Or(
         Eval('feature', '') == 'asset',
-        Eval('booktransf_feature', '') == 'asset',
-        ),
+        Eval('booktransf_feature', '') == 'asset'),
     'readonly': Or(
         STATES['readonly'],
-        Eval('bookingtype', '').in_(['spin', 'spout']),
-        ),
+        Eval('bookingtype', '').in_(['spin', 'spout'])),
     }
 DEPENDSQ1 = ['feature', 'booktransf_feature', 'quantity_digits', 'bookingtype']
 DEPENDSQ1.extend(DEPENDS)
@@ -38,14 +36,12 @@ STATESQ1B.update(STATESQ1)
 STATESQ1B['invisible'] = And(
         Eval('feature', '') != 'asset',
         Eval('booktransf_feature', '') != 'asset',
-        Eval('splitline_has_quantity', False) == False,
-    )
+        ~Eval('splitline_has_quantity', False))
 
 
 STATESQ2 = {
     'invisible': Eval('feature', '') != 'asset',
-    'required': Eval('feature', '') == 'asset',
-    }
+    'required': Eval('feature', '') == 'asset'}
 DEPENDSQ2 = ['feature', 'quantity_digits', 'bookingtype']
 
 
@@ -66,30 +62,26 @@ class Line(SecondUomMixin, metaclass=PoolMeta):
         states=STATESQ2, depends=DEPENDSQ2)
 
     quantity_digits = fields.Function(fields.Integer(
-        string='Digits',
-        readonly=True, states={'invisible': True}),
+        string='Digits', readonly=True, states={'invisible': True}),
         'on_change_with_quantity_digits')
     quantity_uom = fields.Function(fields.Many2One(
-        string='Symbol',
-        readonly=True, model_name='product.uom'),
+        string='Symbol', readonly=True, model_name='product.uom'),
         'on_change_with_quantity_uom')
     asset_rate = fields.Function(fields.Numeric(
         string='Rate', readonly=True,
         digits=(16, If(
             Eval('currency_digits', 2) > Eval('quantity_digits', 2),
             Eval('currency_digits', 2), Eval('quantity_digits', 2))),
-        states={
-            'invisible': Eval('feature', '') != 'asset',
-        }, depends=['currency_digits', 'quantity_digits', 'feature']),
+        states={'invisible': Eval('feature', '') != 'asset'},
+        depends=['currency_digits', 'quantity_digits', 'feature']),
         'on_change_with_asset_rate')
     quantity_balance = fields.Function(fields.Numeric(
         string='Quantity',
         digits=(16, Eval('quantity_digits', 4)), readonly=True,
         help='Number of shares in the cashbook up to the current ' +
         'row if the default sort applies.',
-        states={
-            'invisible': Eval('feature', '') != 'asset',
-        }, depends=['quantity_digits', 'feature']),
+        states={'invisible': Eval('feature', '') != 'asset'},
+        depends=['quantity_digits', 'feature']),
         'on_change_with_quantity_balance')
     splitline_has_quantity = fields.Function(fields.Boolean(
         string='has quantity', readonly=True, states={'invisible': True}),
@@ -101,50 +93,42 @@ class Line(SecondUomMixin, metaclass=PoolMeta):
         help='Valuation of the investment based on the current ' +
         'stock market price.',
         readonly=True, digits=(16, Eval('currency_digits', 2)),
-        states={
-            'invisible': Eval('feature', '') != 'asset',
-        }, depends=['currency_digits', 'feature']),
+        states={'invisible': Eval('feature', '') != 'asset'},
+        depends=['currency_digits', 'feature']),
         'on_change_with_current_value')
     diff_amount = fields.Function(fields.Numeric(
         string='Difference',
         help='Difference between acquisition value and current value',
         readonly=True, digits=(16, Eval('currency_digits', 2)),
-        states={
-            'invisible': Eval('feature', '') != 'asset',
-        }, depends=['currency_digits', 'feature']),
-        'on_change_with_diff_amount')
+        states={'invisible': Eval('feature', '') != 'asset'},
+        depends=['currency_digits', 'feature']), 'on_change_with_diff_amount')
     diff_percent = fields.Function(fields.Numeric(
         string='Percent',
         help='percentage performance since acquisition',
         readonly=True, digits=(16, Eval('currency_digits', 2)),
-        states={
-            'invisible': Eval('feature', '') != 'asset',
-        }, depends=['currency_digits', 'feature']),
-        'on_change_with_diff_percent')
+        states={'invisible': Eval('feature', '') != 'asset'},
+        depends=['currency_digits', 'feature']), 'on_change_with_diff_percent')
 
     trade_fee = fields.Function(fields.Numeric(
         string='Fee',
         help='Trading fee for the current booking line.',
         readonly=True, digits=(16, Eval('currency_digits', 2)),
-        states={
-            'invisible': Eval('feature', '') != 'asset',
-        }, depends=['currency_digits', 'feature']),
+        states={'invisible': Eval('feature', '') != 'asset'},
+        depends=['currency_digits', 'feature']),
         'get_yield_data', searcher='search_trade_fee')
     asset_dividend = fields.Function(fields.Numeric(
         string='Dividend',
         help='Dividend received at the current booking line.',
         readonly=True, digits=(16, Eval('currency_digits', 2)),
-        states={
-            'invisible': Eval('feature', '') != 'asset',
-        }, depends=['currency_digits', 'feature']),
+        states={'invisible': Eval('feature', '') != 'asset'},
+        depends=['currency_digits', 'feature']),
         'get_yield_data', searcher='search_asset_dividend')
     asset_gainloss = fields.Function(fields.Numeric(
         string='Profit/Loss',
         help='Profit or loss on sale on the current booking line.',
         readonly=True, digits=(16, Eval('currency_digits', 2)),
-        states={
-            'invisible': Eval('feature', '') != 'asset',
-        }, depends=['currency_digits', 'feature']),
+        states={'invisible': Eval('feature', '') != 'asset'},
+        depends=['currency_digits', 'feature']),
         'get_yield_data', searcher='search_asset_gainloss')
 
     @classmethod
@@ -176,7 +160,7 @@ class Line(SecondUomMixin, metaclass=PoolMeta):
                 tab_mvsp_counterpart,
                 # [MV-SP] transfer booking,
                 # select counterpart [1] - a split-booking
-                condition=tab_line.bookingtype.in_(['mvin', 'mvout']) & \
+                condition=tab_line.bookingtype.in_(['mvin', 'mvout']) &
                 ((tab_line.reference == tab_mvsp_counterpart.id) |
                     (tab_line.id == tab_mvsp_counterpart.reference)) &
                 (tab_mvsp_counterpart.bookingtype.in_(['spin', 'spout'])),
@@ -185,9 +169,9 @@ class Line(SecondUomMixin, metaclass=PoolMeta):
                 tab_mv_spline,
                 # [MV-SP] line is linked to split-booking-line
                 # of counterpart [1]
-                condition=(tab_mv_spline.line == tab_mvsp_counterpart.id) & \
-                (tab_mv_spline.splittype == 'tr') & \
-                (tab_mv_spline.booktransf != None) & \
+                condition=(tab_mv_spline.line == tab_mvsp_counterpart.id) &
+                (tab_mv_spline.splittype == 'tr') &
+                (tab_mv_spline.booktransf != DEF_NONE) &
                 (tab_mv_spline.booktransf == gainloss_book),
                 type_='LEFT OUTER',
 
@@ -195,20 +179,20 @@ class Line(SecondUomMixin, metaclass=PoolMeta):
                 tab_spmv_counterpart,
                 # [SP-MV] split booking, select counterpart [1]
                 # - a transfer-booking
-                condition=tab_line.bookingtype.in_(['spin', 'spout']) & \
-                ((tab_line.reference == tab_spmv_counterpart.id) | \
-                    (tab_line.id == tab_spmv_counterpart.reference)) & \
-                tab_spmv_counterpart.bookingtype.in_(['mvin', 'mvout']) & \
+                condition=tab_line.bookingtype.in_(['spin', 'spout']) &
+                ((tab_line.reference == tab_spmv_counterpart.id) |
+                    (tab_line.id == tab_spmv_counterpart.reference)) &
+                tab_spmv_counterpart.bookingtype.in_(['mvin', 'mvout']) &
                 (tab_spmv_counterpart.cashbook == gainloss_book),
                 type_='LEFT OUTER',
 
             ).join(
                 tab_mvmv_counterpart,
                 # [MV-MV] transfer booking
-                condition=tab_line.bookingtype.in_(['mvin', 'mvout']) & \
-                ((tab_mvmv_counterpart.reference == tab_line.id) | \
-                    (tab_mvmv_counterpart.id == tab_line.reference)) & \
-                tab_mvmv_counterpart.bookingtype.in_(['mvin', 'mvout']) & \
+                condition=tab_line.bookingtype.in_(['mvin', 'mvout']) &
+                ((tab_mvmv_counterpart.reference == tab_line.id) |
+                    (tab_mvmv_counterpart.id == tab_line.reference)) &
+                tab_mvmv_counterpart.bookingtype.in_(['mvin', 'mvout']) &
                 (tab_mvmv_counterpart.cashbook == gainloss_book),
                 type_='LEFT OUTER',
             ).select(
@@ -218,17 +202,14 @@ class Line(SecondUomMixin, metaclass=PoolMeta):
                     Case(
                         (tab_line.bookingtype == 'mvin', tab_mv_spline.amount),
                         (tab_line.bookingtype == 'mvout',
-                            tab_mv_spline.amount * Decimal('-1.0')),
-                    ),
+                            tab_mv_spline.amount * Decimal('-1.0'))),
                     Case(
                         (tab_mvsp_counterpart.cashbook == gainloss_book,
-                            tab_line.debit - tab_line.credit),
-                    ),
+                            tab_line.debit - tab_line.credit)),
                     tab_spmv_counterpart.credit - tab_spmv_counterpart.debit,
                     Decimal('0.0'),
                 ) * Decimal('-1.0')).as_('gainloss'),
-                tab_line.cashbook,
-            )
+                tab_line.cashbook)
         return (tab_line, query)
 
     @classmethod
@@ -262,17 +243,17 @@ class Line(SecondUomMixin, metaclass=PoolMeta):
             ).join(
                 tab_inout_fee,
                 # [INOUT] fee, local booked
-                condition=(tab_inout_fee.id == tab_line.id) & \
-                tab_inout_fee.bookingtype.in_(['in', 'out']) & \
-                (tab_inout_fee.category != None) & \
+                condition=(tab_inout_fee.id == tab_line.id) &
+                tab_inout_fee.bookingtype.in_(['in', 'out']) &
+                (tab_inout_fee.category != DEF_NONE) &
                 (tab_inout_fee.category == fee_category),
                 type_='LEFT OUTER',
             ).join(
                 tab_inout_divi,
                 # [INOUT] dividend, local booked
-                condition=(tab_inout_divi.id == tab_line.id) & \
-                tab_inout_divi.bookingtype.in_(['in', 'out']) & \
-                (tab_inout_divi.category != None) & \
+                condition=(tab_inout_divi.id == tab_line.id) &
+                tab_inout_divi.bookingtype.in_(['in', 'out']) &
+                (tab_inout_divi.category != DEF_NONE) &
                 (tab_inout_divi.category == dividend_category),
                 type_='LEFT OUTER',
 
@@ -280,46 +261,46 @@ class Line(SecondUomMixin, metaclass=PoolMeta):
                 tab_mv_counterpart,
                 # [MV] transfer booking, select counterpart [1]
                 # - a split-booking
-                condition=tab_line.bookingtype.in_(['mvin', 'mvout']) & \
-                ((tab_line.reference == tab_mv_counterpart.id) | \
-                    (tab_line.id == tab_mv_counterpart.reference)) & \
+                condition=tab_line.bookingtype.in_(['mvin', 'mvout']) &
+                ((tab_line.reference == tab_mv_counterpart.id) |
+                    (tab_line.id == tab_mv_counterpart.reference)) &
                 (tab_mv_counterpart.bookingtype.in_(['spin', 'spout'])),
                 type_='LEFT OUTER',
             ).join(
                 tab_mv_spline_fee,
                 # [MV] fee-line is linked to split-booking-line
                 # of counterpart [1]
-                condition=(tab_mv_spline_fee.line == tab_mv_counterpart.id) & \
-                (tab_mv_spline_fee.splittype == 'cat') & \
-                (tab_mv_spline_fee.category != None) & \
+                condition=(tab_mv_spline_fee.line == tab_mv_counterpart.id) &
+                (tab_mv_spline_fee.splittype == 'cat') &
+                (tab_mv_spline_fee.category != DEF_NONE) &
                 (tab_mv_spline_fee.category == fee_category),
                 type_='LEFT OUTER',
             ).join(
                 tab_mv_spline_divi,
                 # [MV] dividend-line is linked to split-booking-line
                 # of counterpart [1]
-                condition=(tab_mv_spline_divi.line == tab_mv_counterpart.id) & \
-                (tab_mv_spline_divi.splittype == 'cat') & \
-                (tab_mv_spline_divi.category != None) & \
+                condition=(tab_mv_spline_divi.line == tab_mv_counterpart.id) &
+                (tab_mv_spline_divi.splittype == 'cat') &
+                (tab_mv_spline_divi.category != DEF_NONE) &
                 (tab_mv_spline_divi.category == dividend_category),
                 type_='LEFT OUTER',
 
             ).join(
                 tab_spline_fee,
                 # [SP] fee, split booking
-                condition=(tab_spline_fee.line == tab_line.id) & \
-                tab_line.bookingtype.in_(['spin', 'spout']) & \
-                (tab_spline_fee.splittype == 'cat') & \
-                (tab_spline_fee.category != None) & \
+                condition=(tab_spline_fee.line == tab_line.id) &
+                tab_line.bookingtype.in_(['spin', 'spout']) &
+                (tab_spline_fee.splittype == 'cat') &
+                (tab_spline_fee.category != DEF_NONE) &
                 (tab_spline_fee.category == fee_category),
                 type_='LEFT OUTER',
             ).join(
                 tab_spline_divi,
                 # [SP] dividend, split booking
-                condition=(tab_spline_divi.line == tab_line.id) & \
-                tab_line.bookingtype.in_(['spin', 'spout']) & \
-                (tab_spline_divi.splittype == 'cat') & \
-                (tab_spline_divi.category != None) & \
+                condition=(tab_spline_divi.line == tab_line.id) &
+                tab_line.bookingtype.in_(['spin', 'spout']) &
+                (tab_spline_divi.splittype == 'cat') &
+                (tab_spline_divi.category != DEF_NONE) &
                 (tab_spline_divi.category == dividend_category),
                 type_='LEFT OUTER',
             ).select(
@@ -350,8 +331,7 @@ class Line(SecondUomMixin, metaclass=PoolMeta):
                     Decimal('0.0'),
                     )).as_('dividend'),
                 tab_line.cashbook,
-                group_by=[tab_line.id, tab_line.cashbook],
-            )
+                group_by=[tab_line.id, tab_line.cashbook])
         return (tab_line, query)
 
     @classmethod
@@ -363,8 +343,7 @@ class Line(SecondUomMixin, metaclass=PoolMeta):
 
         query = tab_query.select(
                 tab_query.id,
-                where=Operator(tab_query.fee, clause[2]),
-            )
+                where=Operator(tab_query.fee, clause[2]))
         return [('id', 'in', query)]
 
     @classmethod
@@ -376,8 +355,7 @@ class Line(SecondUomMixin, metaclass=PoolMeta):
 
         query = tab_query.select(
                 tab_query.id,
-                where=Operator(tab_query.dividend, clause[2]),
-            )
+                where=Operator(tab_query.dividend, clause[2]))
         return [('id', 'in', query)]
 
     @classmethod
@@ -389,8 +367,7 @@ class Line(SecondUomMixin, metaclass=PoolMeta):
 
         query = tab_query.select(
                 tab_query.id,
-                where=Operator(tab_query.gainloss, clause[2]),
-            )
+                where=Operator(tab_query.gainloss, clause[2]))
         return [('id', 'in', query)]
 
     @classmethod
@@ -421,8 +398,7 @@ class Line(SecondUomMixin, metaclass=PoolMeta):
                 line = Line2(record[0])
                 values = {
                     'trade_fee': quantize_val(record[1], line),
-                    'asset_dividend': quantize_val(record[2], line),
-                    }
+                    'asset_dividend': quantize_val(record[2], line)}
                 for name in list(name_set):
                     result[name][record[0]] = values[name]
 
@@ -452,8 +428,7 @@ class Line(SecondUomMixin, metaclass=PoolMeta):
                 'quantity': Report.format_number(
                     credit - debit,
                     lang=None, digits=self.quantity_digits),
-                'uom_symbol': getattr(self.quantity_uom, 'symbol', '-'),
-                }
+                'uom_symbol': getattr(self.quantity_uom, 'symbol', '-')}
         return recname
 
     @classmethod
@@ -516,8 +491,7 @@ class Line(SecondUomMixin, metaclass=PoolMeta):
         result = super(Line, cls).get_counterpart_values(
                 line,
                 splitline=splitline,
-                values=values
-            )
+                values=values)
 
         line_uom = getattr(line.quantity_uom, 'id', None)
         booktransf_uom = getattr(getattr(
@@ -543,27 +517,23 @@ class Line(SecondUomMixin, metaclass=PoolMeta):
                 if (asset_books == 2) and (diff_uom is True)
                 else splitline.quantity,
                 'quantity_2nd_uom': splitline.quantity
-                if (asset_books == 2) and (diff_uom is True) else None,
-                })
+                if (asset_books == 2) and (diff_uom is True) else None})
         elif sum([1 if booktransf_uom is not None else 0,
                   1 if line_uom is not None else 0]) == 1:
             # one of the related cashbooks only is asset-type
             result.update({
                 'quantity': line.quantity,
-                'quantity_2nd_uom': None,
-                })
+                'quantity_2nd_uom': None})
         elif sum([1 if booktransf_uom is not None else 0,
                   1 if line_uom is not None else 0]) == 2:
             if line_uom == booktransf_uom:
                 result.update({
                     'quantity': line.quantity,
-                    'quantity_2nd_uom': None,
-                    })
+                    'quantity_2nd_uom': None})
             else:
                 result.update({
                     'quantity': line.quantity_2nd_uom,
-                    'quantity_2nd_uom': line.quantity,
-                    })
+                    'quantity_2nd_uom': line.quantity})
         return result
 
     @fields.depends('amount', 'splitlines', 'quantity')
@@ -728,8 +698,7 @@ class Line(SecondUomMixin, metaclass=PoolMeta):
                     (line.quantity_debit is None):
                 raise UserError(gettext(
                     'cashbook_investment.msg_line_quantity_not_set',
-                    linetxt=line.rec_name,
-                    ))
+                    linetxt=line.rec_name))
 
             # quantity and amount must with same sign
             if (line.amount != Decimal('0.0')) and \
@@ -739,8 +708,7 @@ class Line(SecondUomMixin, metaclass=PoolMeta):
                 if amount_sign != quantity_sign:
                     raise UserError(gettext(
                         'cashbook_investment.msg_line_sign_mismatch',
-                        linetxt=line.rec_name,
-                        ))
+                        linetxt=line.rec_name))
 
     @classmethod
     def update_values_by_splitlines(cls, lines):
@@ -753,7 +721,7 @@ class Line(SecondUomMixin, metaclass=PoolMeta):
             quantity = sum([
                 x.quantity or Decimal('0.0') for x in line.splitlines])
             if (cnt1 > 0) and (quantity != line.quantity):
-                to_write.extend([[line], {'quantity': quantity, }])
+                to_write.extend([[line], {'quantity': quantity}])
         return to_write
 
     @classmethod

mixin.py

@@ -29,11 +29,10 @@ class SecondUomMixin(object):
         states={
             'readonly': Or(
                 STATESQ['readonly'],
-                    ~Bool(Eval('quantity2nd'))
-                ),
+                ~Bool(Eval('quantity2nd'))),
             'required': Bool(Eval('quantity2nd')),
-            'invisible': ~Bool(Eval('quantity2nd')),
-        }, depends=DEPENDSQ+['quantity2nd_digits', 'quantity2nd'])
+            'invisible': ~Bool(Eval('quantity2nd'))},
+        depends=DEPENDSQ+['quantity2nd_digits', 'quantity2nd'])
     factor_2nd_uom = fields.Function(fields.Numeric(
         string='Conversion factor',
         help='Conversion factor between the units of the ' +
@@ -42,11 +41,10 @@ class SecondUomMixin(object):
         states={
             'readonly': Or(
                 STATESQ['readonly'],
-                    ~Bool(Eval('quantity2nd'))
-                ),
+                ~Bool(Eval('quantity2nd'))),
             'required': Bool(Eval('quantity2nd')),
-            'invisible': ~Bool(Eval('quantity2nd')),
-        }, depends=DEPENDSQ+['quantity2nd_digits', 'quantity2nd']),
+            'invisible': ~Bool(Eval('quantity2nd'))},
+        depends=DEPENDSQ+['quantity2nd_digits', 'quantity2nd']),
         'on_change_with_factor_2nd_uom', setter='set_factor_2nd_uom')
 
     quantity2nd = fields.Function(fields.Many2One(
@@ -86,8 +84,7 @@ class SecondUomMixin(object):
                             raise UserError(gettext(
                                 'cashbook_investment.msg_uomcat_mismatch',
                                 cat1=from_uom.category.rec_name,
-                                cat2=booktransf.quantity_uom.category.rec_name,
-                                ))
+                                cat2=booktransf.quantity_uom.category.rec_name))
 
                         values['quantity_2nd_uom'] = Decimal(UOM.compute_qty(
                                 from_uom,
@@ -96,8 +93,7 @@ class SecondUomMixin(object):
                                 round=False,
                             )).quantize(Decimal(
                                     Decimal(1) /
-                                    10 ** booktransf.quantity_digits)
-                                )
+                                    10 ** booktransf.quantity_digits))
         return values
 
     @classmethod
@@ -175,8 +171,7 @@ class SecondUomMixin(object):
                     self.quantity_uom,
                     float(self.quantity),
                     self.booktransf.quantity_uom,
-                    round=False,
-                ))
+                    round=False))
             if self.quantity != Decimal('0.0'):
                 self.factor_2nd_uom = (
                         self.quantity_2nd_uom / self.quantity

reconciliation.py

@@ -39,15 +39,18 @@ class Reconciliation(metaclass=PoolMeta):
         """
         recname = super(Reconciliation, self).get_rec_name(name)
         if self.cashbook.feature == 'asset':
-            recname += ' | %(start_quantity)s %(uom_symbol)s - %(end_quantity)s %(uom_symbol)s' % {
-                'start_quantity': Report.format_number(
+            recname += ' '.join([
+                ' |',
+                Report.format_number(
                     self.start_quantity or 0.0, None,
                     digits=self.quantity_digits),
-                'end_quantity': Report.format_number(
+                getattr(self.quantity_uom, 'symbol', '-'),
+                '-',
+                Report.format_number(
                     self.end_quantity or 0.0, None,
                     digits=self.quantity_digits),
-                'uom_symbol': getattr(self.quantity_uom, 'symbol', '-'),
-                }
+                getattr(self.quantity_uom, 'symbol', '-')
+                ])
         return recname
 
     @fields.depends('cashbook', '_parent_cashbook.quantity_uom')
@@ -82,8 +85,7 @@ class Reconciliation(metaclass=PoolMeta):
         values = super(Reconciliation, cls).get_values_wfedit(reconciliation)
         values.update({
             'start_quantity': Decimal('0.0'),
-            'end_quantity': Decimal('0.0'),
-            })
+            'end_quantity': Decimal('0.0')})
         return values
 
     @classmethod
@@ -116,8 +118,7 @@ class Reconciliation(metaclass=PoolMeta):
         # add quantities of already linked lines
         values['end_quantity'] += sum([
                 x.quantity_credit - x.quantity_debit
-                for x in reconciliation.lines
-            ])
+                for x in reconciliation.lines])
 
         return values
 

splitline.py

@@ -45,8 +45,7 @@ class SplitLine(SecondUomMixin, metaclass=PoolMeta):
                 'quantity': Report.format_number(
                     self.quantity or 0.0, None,
                     digits=self.quantity_digits),
-                'uom_symbol': self.quantity_uom.symbol,
-                }
+                'uom_symbol': self.quantity_uom.symbol}
         return recname
 
     @fields.depends(
@@ -76,7 +75,6 @@ class SplitLine(SecondUomMixin, metaclass=PoolMeta):
         if self.booktransf:
             if self.booktransf.feature == 'asset':
                 return self.booktransf.quantity_digits
-
         return 4
 
     @classmethod

tests/book.py

@@ -48,6 +48,25 @@ class CbInvTestCase(object):
             self.assertEqual(book.quantity_digits, 4)
             self.assertEqual(book.show_performance, True)
 
+            # run sorter
+            Book.search(
+                [],
+                order=[
+                    ('current_value', 'ASC'),
+                    ('purchase_amount', 'ASC'),
+                    ('diff_amount', 'ASC'),
+                    ('yield_balance', 'ASC'),
+                    ('diff_percent', 'ASC'),
+                    ('quantity', 'ASC'),
+                    ('quantity_all', 'ASC'),
+                    ('yield_sales', 'ASC'),
+                    ('yield_sales_12m', 'ASC'),
+                    ('yield_dividend_total', 'ASC'),
+                    ('yield_dividend_12m', 'ASC'),
+                    ('yield_fee_total', 'ASC'),
+                    ('yield_fee_12m', 'ASC'),
+                    ])
+
     @with_transaction()
     def test_assetbook_aggregated_values(self):
         """ create cashbooks with hierarchy, add lines,
@@ -84,6 +103,12 @@ class CbInvTestCase(object):
                 asset.rec_name, 'Product 1 | 12.5000 usd/u | 05/02/2022')
 
             (usd, euro) = self.prep_2nd_currency(company)
+            self.assertEqual(len(usd.rates), 1)
+            self.assertEqual(usd.rates[0].rate, Decimal('1.05'))
+            self.assertEqual(usd.rates[0].date, date(2022, 5, 2))
+            self.assertEqual(euro.rates[0].rate, Decimal('1.0'))
+            self.assertEqual(euro.rates[0].date, date(2022, 5, 2))
+
             self.assertEqual(company.currency.rec_name, 'Euro')
 
             BType.write(*[
@@ -163,24 +188,53 @@ class CbInvTestCase(object):
                         }])],
                     }])],
                 }])
+            self.prep_valstore_run_worker()
+
             self.assertEqual(len(books), 1)
             self.assertEqual(books[0].rec_name, 'L0-Euro-None')
             self.assertEqual(books[0].balance, Decimal('58.57'))
             self.assertEqual(books[0].balance_ref, Decimal('58.57'))
             # balance of asset-books: 29,286 €
             # value of asset-books: 11.9€ + 12.5USD/1.05 = 23.8€
-            self.assertEqual(books[0].current_value, Decimal('23.8'))
-            self.assertEqual(books[0].current_value_ref, Decimal('23.8'))
+            # current_value:
+            # +15€        (15.00€ - L1-Euro-Cash)
+            # +15$ / 1.05 (14.29€ - L1-USD-Cash)
+            # +12.5$/1.05 (11.90€ - L1-Euro-Depot)
+            # +12.5$/1.05 (11.90€ - L1-USD-Depot)
+            # = 53.09€
+            self.assertEqual(books[0].current_value, Decimal('53.09'))
+            self.assertEqual(books[0].current_value_ref, Decimal('53.09'))
+            self.assertEqual(books[0].purchase_amount, Decimal('58.58'))
             self.assertEqual(books[0].diff_amount, Decimal('-5.49'))
-            self.assertEqual(books[0].diff_percent, Decimal('-18.74'))
+            self.assertEqual(books[0].diff_percent, Decimal('-9.37'))
+
+            # searcher
+            self.assertEqual(Book.search_count([
+                ('current_value', '=', Decimal('53.09'))]), 1)
+            self.assertEqual(Book.search_count([
+                ('current_value_ref', '=', Decimal('53.09'))]), 1)
+            self.assertEqual(Book.search_count([
+                ('diff_amount', '=', Decimal('-5.49'))]), 1)
+            self.assertEqual(Book.search_count([
+                ('diff_percent', '=', Decimal('-9.37'))]), 1)
+            self.assertEqual(Book.search_count([
+                ('quantity', '=', Decimal('1.0'))]), 2)
+            self.assertEqual(Book.search_count([
+                ('quantity_all', '=', Decimal('1.0'))]), 2)
+            self.assertEqual(Book.search_count([
+                ('current_rate', '=', Decimal('11.9'))]), 1)
+            self.assertEqual(Book.search_count([
+                ('purchase_amount', '=', Decimal('15.0'))]), 4)
 
             self.assertEqual(len(books[0].childs), 4)
 
             self.assertEqual(
                 books[0].childs[0].rec_name,
                 'L0-Euro-None/L1-Euro-Cash | 15.00 € | Open')
-            self.assertEqual(books[0].childs[0].current_value, None)
-            self.assertEqual(books[0].childs[0].current_value_ref, None)
+            self.assertEqual(
+                books[0].childs[0].current_value, Decimal('15.0'))
+            self.assertEqual(
+                books[0].childs[0].current_value_ref, Decimal('15.0'))
             self.assertEqual(books[0].childs[0].diff_amount, None)
             self.assertEqual(books[0].childs[0].diff_percent, None)
 
@@ -190,6 +244,7 @@ class CbInvTestCase(object):
             self.assertEqual(
                 books[0].childs[1].asset.rec_name,
                 'Product 1 | 12.5000 usd/u | 05/02/2022')
+            # asset: usd, rate 12.50 usd/u @ 2022-05-02
             self.assertEqual(
                 books[0].childs[1].current_value, Decimal('11.9'))
             self.assertEqual(
@@ -202,8 +257,10 @@ class CbInvTestCase(object):
             self.assertEqual(
                 books[0].childs[2].rec_name,
                 'L0-Euro-None/L1-USD-Cash | 15.00 usd | Open')
-            self.assertEqual(books[0].childs[2].current_value, None)
-            self.assertEqual(books[0].childs[2].current_value_ref, None)
+            self.assertEqual(
+                books[0].childs[2].current_value, Decimal('15.0'))
+            self.assertEqual(
+                books[0].childs[2].current_value_ref, Decimal('14.29'))
             self.assertEqual(books[0].childs[2].diff_amount, None)
             self.assertEqual(books[0].childs[2].diff_percent, None)
 
@@ -327,10 +384,11 @@ class CbInvTestCase(object):
 
             # wf --> check
             Line.wfcheck(book.lines)
+            self.prep_valstore_run_worker()
 
             # check quantities at cashbook
             with Transaction().set_context({
-                    'qdate': date(2022, 5, 5)}):
+                    'date': date(2022, 5, 5)}):
                 book2, = Book.browse([book])
                 self.assertEqual(book.asset.rate, Decimal('2.8'))   # usd
                 self.assertEqual(book2.quantity, Decimal('1.453'))
@@ -340,7 +398,7 @@ class CbInvTestCase(object):
                 self.assertEqual(book2.current_value_ref, Decimal('3.87'))
 
             with Transaction().set_context({
-                    'qdate': date(2022, 5, 12)}):
+                    'date': date(2022, 5, 12)}):
                 book2, = Book.browse([book])
                 self.assertEqual(book2.quantity, Decimal('4.753'))
                 self.assertEqual(book2.quantity_all, Decimal('4.753'))
@@ -399,6 +457,17 @@ class CbInvTestCase(object):
                 'Aurum | 1,750.0000 usd/oz | 05/01/2022')
 
             (usd, euro) = self.prep_2nd_currency(company)
+
+            usd.rates[0].date = date(2022, 5, 1)
+            usd.rates[0].save()
+            self.assertEqual(len(usd.rates), 1)
+            self.assertEqual(usd.rates[0].date, date(2022, 5, 1))
+
+            euro.rates[0].date = date(2022, 5, 1)
+            euro.rates[0].save()
+            self.assertEqual(len(euro.rates), 1)
+            self.assertEqual(euro.rates[0].date, date(2022, 5, 1))
+
             self.assertEqual(company.currency.rec_name, 'Euro')
             self.assertEqual(asset.symbol, 'usd/oz')
 
@@ -441,7 +510,7 @@ class CbInvTestCase(object):
 
             # check quantities at cashbook
             with Transaction().set_context({
-                    'qdate': date(2022, 5, 1)}):
+                    'date': date(2022, 5, 1)}):
                 book2, = Book.browse([book])
                 self.assertEqual(book.asset.rate, Decimal('1750.0'))   # usd
                 self.assertEqual(book2.quantity, Decimal('20.0'))
@@ -508,6 +577,16 @@ class CbInvTestCase(object):
                 'Aurum | 1,750.0000 usd/oz | 05/01/2022')
 
             (usd, euro) = self.prep_2nd_currency(company)
+            usd.rates[0].date = date(2022, 5, 1)
+            usd.rates[0].save()
+            self.assertEqual(len(usd.rates), 1)
+            self.assertEqual(usd.rates[0].date, date(2022, 5, 1))
+
+            euro.rates[0].date = date(2022, 5, 1)
+            euro.rates[0].save()
+            self.assertEqual(len(euro.rates), 1)
+            self.assertEqual(euro.rates[0].date, date(2022, 5, 1))
+
             self.assertEqual(company.currency.rec_name, 'Euro')
             self.assertEqual(asset.symbol, 'usd/oz')
             chf, = Currency.create([{
@@ -562,14 +641,16 @@ class CbInvTestCase(object):
 
             # check quantities at cashbook
             with Transaction().set_context({
-                    'qdate': date(2022, 5, 1)}):
+                    'date': date(2022, 5, 1)}):
                 book2, = Book.browse([book])
                 self.assertEqual(book.asset.rate, Decimal('1750.0'))   # usd
                 self.assertEqual(book2.quantity, Decimal('20.0'))
                 self.assertEqual(book2.quantity_all, Decimal('20.0'))
                 # usd --> chf: 1750 US$ * 0.95 / 1.05 = 1583.333 €
-                # 1 ounce --> 20 gram: 1583.333 CHF * 20 / 28.3495 = 1117.0097 CHF
-                self.assertEqual(book2.current_value, Decimal('1117.01'))   # CHF
+                # 1 ounce --> 20 gram:
+                #   1583.333 CHF * 20 / 28.3495 = 1117.0097 CHF
+                self.assertEqual(
+                    book2.current_value, Decimal('1117.01'))   # CHF
                 self.assertEqual(
                     book2.current_value_ref, Decimal('1175.80'))   # EUR
                 self.assertEqual(book2.diff_amount, Decimal('-132.99'))
@@ -698,7 +779,8 @@ class CbInvTestCase(object):
                 }])
             self.assertEqual(
                 books[1].lines[1].rec_name,
-                '05/01/2022|from|1.00 usd|- [Book 1 | 1.00 usd | Open | 1.000 u]')
+                '05/01/2022|from|1.00 usd|- [Book 1 | ' +
+                '1.00 usd | Open | 1.000 u]')
             self.assertEqual(books[1].lines[1].quantity_digits, 3)
 
     @with_transaction()
@@ -736,7 +818,8 @@ class CbInvTestCase(object):
                 }])
 
             self.assertEqual(book.name, 'Book 1')
-            self.assertEqual(book.rec_name, 'Book 1 | 0.00 usd | Open | 0.0000 u')
+            self.assertEqual(
+                book.rec_name, 'Book 1 | 0.00 usd | Open | 0.0000 u')
             self.assertEqual(book.btype.rec_name, 'A - Asset')
             self.assertEqual(book.state, 'open')
             self.assertEqual(book.feature, 'asset')
@@ -846,7 +929,8 @@ class CbInvTestCase(object):
                 }])
 
             self.prep_category(cattype='in')
-            category_out = self.prep_category(name='Out Category', cattype='out')
+            category_out = self.prep_category(
+                name='Out Category', cattype='out')
             self.prep_party()
 
             asset = self.prep_asset_item(
@@ -919,6 +1003,7 @@ class CbInvTestCase(object):
 
             # set line to 'checked', this creates the counterpart
             Line.wfcheck(list(book.lines))
+            self.prep_valstore_run_worker()
 
             self.assertEqual(book.rec_name, 'Book 1 | -1.00 usd | Open')
             self.assertEqual(len(book.lines), 1)
@@ -1009,7 +1094,8 @@ class CbInvTestCase(object):
                     'feature': 'asset',
                 }])
 
-            category_out = self.prep_category(name='Out Category', cattype='out')
+            category_out = self.prep_category(
+                name='Out Category', cattype='out')
             self.prep_party()
 
             asset = self.prep_asset_item(
@@ -1063,6 +1149,7 @@ class CbInvTestCase(object):
             self.assertEqual(len(book2.lines), 0)
 
             Line.wfcheck(list(book1.lines))
+            self.prep_valstore_run_worker()
 
             self.assertEqual(
                 book1.rec_name,
@@ -1100,7 +1187,8 @@ class CbInvTestCase(object):
                 }])
 
             self.prep_category(cattype='in')
-            category_out = self.prep_category(name='Out Category', cattype='out')
+            category_out = self.prep_category(
+                name='Out Category', cattype='out')
             self.prep_party()
 
             asset = self.prep_asset_item(
@@ -1160,6 +1248,7 @@ class CbInvTestCase(object):
 
             # set line to 'checked', this creates the counterpart
             Line.wfcheck(list(book.lines))
+            self.prep_valstore_run_worker()
 
             self.assertEqual(book.rec_name, 'Book 1 | 1.00 usd | Open')
             self.assertEqual(len(book.lines), 1)
@@ -1240,7 +1329,8 @@ class CbInvTestCase(object):
                 }])
 
             self.prep_category(cattype='in')
-            category_out = self.prep_category(name='Out Category', cattype='out')
+            category_out = self.prep_category(
+                name='Out Category', cattype='out')
             self.prep_party()
 
             asset = self.prep_asset_item(
@@ -1306,6 +1396,7 @@ class CbInvTestCase(object):
 
             # set line to 'checked', this creates the counterpart
             Line.wfcheck(list(book.lines))
+            self.prep_valstore_run_worker()
 
             self.assertEqual(
                 book.rec_name,
@@ -1385,7 +1476,8 @@ class CbInvTestCase(object):
                 }])
 
             self.prep_category(cattype='in')
-            category_out = self.prep_category(name='Out Category', cattype='out')
+            category_out = self.prep_category(
+                name='Out Category', cattype='out')
             self.prep_party()
 
             asset1 = self.prep_asset_item(
@@ -1489,6 +1581,7 @@ class CbInvTestCase(object):
 
             # set line to 'checked', this creates the counterpart
             Line.wfcheck(list(book.lines))
+            self.prep_valstore_run_worker()
 
             self.assertEqual(
                 book.rec_name,
@@ -1573,7 +1666,8 @@ class CbInvTestCase(object):
                 }])
 
             self.prep_category(cattype='in')
-            category_out = self.prep_category(name='Out Category', cattype='out')
+            category_out = self.prep_category(
+                name='Out Category', cattype='out')
             self.prep_party()
 
             asset1 = self.prep_asset_item(
@@ -1633,7 +1727,8 @@ class CbInvTestCase(object):
 
             self.assertRaisesRegex(
                 UserError,
-                r'Cannot transfer quantities between cashbooks with different unit-categories \(Time != Weight\).',
+                r'Cannot transfer quantities between cashbooks with ' +
+                r'different unit-categories \(Time != Weight\).',
                 Book.write,
                 *[
                     [book],
@@ -1708,7 +1803,8 @@ class CbInvTestCase(object):
                         }])],
                 }])
 
-            self.assertEqual(book.rec_name, 'Book 1 | 11.00 usd | Open | 4.00 u')
+            self.assertEqual(
+                book.rec_name, 'Book 1 | 11.00 usd | Open | 4.00 u')
             self.assertEqual(book.balance_all, Decimal('11.0'))
             self.assertEqual(len(book.lines), 1)
 
@@ -1723,10 +1819,12 @@ class CbInvTestCase(object):
             self.assertEqual(len(book.lines[0].splitlines), 2)
             self.assertEqual(book.lines[0].splitlines[0].splittype, 'cat')
             self.assertEqual(book.lines[0].splitlines[0].amount, Decimal('5.0'))
-            self.assertEqual(book.lines[0].splitlines[0].quantity, Decimal('1.5'))
+            self.assertEqual(
+                book.lines[0].splitlines[0].quantity, Decimal('1.5'))
             self.assertEqual(book.lines[0].splitlines[1].splittype, 'cat')
             self.assertEqual(book.lines[0].splitlines[1].amount, Decimal('6.0'))
-            self.assertEqual(book.lines[0].splitlines[1].quantity, Decimal('2.5'))
+            self.assertEqual(
+                book.lines[0].splitlines[1].quantity, Decimal('2.5'))
 
     @with_transaction()
     def test_assetbook_split_in_category_and_assetbook(self):
@@ -1814,7 +1912,8 @@ class CbInvTestCase(object):
 
             self.assertEqual(len(books[0].lines[0].splitlines), 2)
             self.assertEqual(books[0].lines[0].splitlines[0].splittype, 'cat')
-            self.assertEqual(books[0].lines[0].splitlines[0].amount, Decimal('5.0'))
+            self.assertEqual(
+                books[0].lines[0].splitlines[0].amount, Decimal('5.0'))
             self.assertEqual(
                 books[0].lines[0].splitlines[0].quantity,
                 Decimal('1.5'))
@@ -1823,7 +1922,8 @@ class CbInvTestCase(object):
                 'Cat1')
             self.assertEqual(books[0].lines[0].splitlines[0].booktransf, None)
             self.assertEqual(books[0].lines[0].splitlines[1].splittype, 'tr')
-            self.assertEqual(books[0].lines[0].splitlines[1].amount, Decimal('6.0'))
+            self.assertEqual(
+                books[0].lines[0].splitlines[1].amount, Decimal('6.0'))
             self.assertEqual(
                 books[0].lines[0].splitlines[1].quantity,
                 Decimal('2.5'))
@@ -1833,11 +1933,13 @@ class CbInvTestCase(object):
             self.assertEqual(len(books[0].lines[0].references), 0)
             self.assertEqual(books[0].lines[0].reference, None)
 
-            self.assertEqual(books[1].rec_name, 'Book 2 | 0.00 usd | Open | 0.00 u')
+            self.assertEqual(
+                books[1].rec_name, 'Book 2 | 0.00 usd | Open | 0.00 u')
             self.assertEqual(books[1].balance_all, Decimal('0.0'))
             self.assertEqual(len(books[1].lines), 0)
 
             Line.wfcheck([books[0].lines[0]])
+            self.prep_valstore_run_worker()
 
             self.assertEqual(
                 books[0].rec_name,
@@ -1855,7 +1957,8 @@ class CbInvTestCase(object):
 
             self.assertEqual(len(books[0].lines[0].splitlines), 2)
             self.assertEqual(books[0].lines[0].splitlines[0].splittype, 'cat')
-            self.assertEqual(books[0].lines[0].splitlines[0].amount, Decimal('5.0'))
+            self.assertEqual(
+                books[0].lines[0].splitlines[0].amount, Decimal('5.0'))
             self.assertEqual(
                 books[0].lines[0].splitlines[0].quantity,
                 Decimal('1.5'))
@@ -1864,7 +1967,8 @@ class CbInvTestCase(object):
                 'Cat1')
             self.assertEqual(books[0].lines[0].splitlines[0].booktransf, None)
             self.assertEqual(books[0].lines[0].splitlines[1].splittype, 'tr')
-            self.assertEqual(books[0].lines[0].splitlines[1].amount, Decimal('6.0'))
+            self.assertEqual(
+                books[0].lines[0].splitlines[1].amount, Decimal('6.0'))
             self.assertEqual(
                 books[0].lines[0].splitlines[1].quantity,
                 Decimal('2.5'))
@@ -1985,11 +2089,13 @@ class CbInvTestCase(object):
             self.assertEqual(len(books[0].lines[0].references), 0)
             self.assertEqual(books[0].lines[0].reference, None)
 
-            self.assertEqual(books[1].rec_name, 'Book 2 | 0.00 usd | Open | 0.00 u')
+            self.assertEqual(
+                books[1].rec_name, 'Book 2 | 0.00 usd | Open | 0.00 u')
             self.assertEqual(books[1].balance_all, Decimal('0.0'))
             self.assertEqual(len(books[1].lines), 0)
 
             Line.wfcheck([books[0].lines[0]])
+            self.prep_valstore_run_worker()
 
             self.assertEqual(
                 books[0].rec_name,
@@ -2172,6 +2278,7 @@ class CbInvTestCase(object):
             self.assertEqual(len(books[1].lines), 0)
 
             Line.wfcheck([books[0].lines[0]])
+            self.prep_valstore_run_worker()
 
             self.assertEqual(
                 books[0].rec_name,
@@ -2269,7 +2376,8 @@ class CbInvTestCase(object):
             self.assertEqual(
                 asset1.rec_name,
                 'Aurum | 1,750.0000 usd/oz | 05/01/2022')
-            self.assertEqual(asset2.rec_name, 'Liquid | 10.0000 usd/l | 05/01/2022')
+            self.assertEqual(
+                asset2.rec_name, 'Liquid | 10.0000 usd/l | 05/01/2022')
 
             (usd, euro) = self.prep_2nd_currency(company)
             self.assertEqual(company.currency.rec_name, 'Euro')
@@ -2310,7 +2418,8 @@ class CbInvTestCase(object):
 
             self.assertRaisesRegex(
                 UserError,
-                r"Cannot transfer quantities between cashbooks with different unit-categories \(Weight != Volume\).",
+                r"Cannot transfer quantities between cashbooks with " +
+                r"different unit-categories \(Weight != Volume\).",
                 Book.write,
                 *[
                     [books[0]],
@@ -2393,7 +2502,8 @@ class CbInvTestCase(object):
                         }])],
                 }])
 
-            self.assertEqual(book.rec_name, 'Book 1 | -11.00 usd | Open | -4.00 u')
+            self.assertEqual(
+                book.rec_name, 'Book 1 | -11.00 usd | Open | -4.00 u')
             self.assertEqual(book.balance_all, Decimal('-11.0'))
             self.assertEqual(len(book.lines), 1)
             self.assertEqual(book.lines[0].splitline_has_quantity, False)
@@ -2502,11 +2612,13 @@ class CbInvTestCase(object):
             self.assertEqual(len(books[0].lines[0].references), 0)
             self.assertEqual(books[0].lines[0].reference, None)
 
-            self.assertEqual(books[1].rec_name, 'Book 2 | 0.00 usd | Open | 0.00 u')
+            self.assertEqual(
+                books[1].rec_name, 'Book 2 | 0.00 usd | Open | 0.00 u')
             self.assertEqual(books[1].balance_all, Decimal('0.0'))
             self.assertEqual(len(books[1].lines), 0)
 
             Line.wfcheck([books[0].lines[0]])
+            self.prep_valstore_run_worker()
 
             self.assertEqual(
                 books[0].rec_name,
@@ -2527,7 +2639,8 @@ class CbInvTestCase(object):
                 books[0].lines[0].splitlines[1].rec_name,
                 'Exp/Sp|6.00 usd|to cashbook [Book 2 | 6.00 usd | Open' +
                 ' | 2.50 u]|2.50 u')
-            self.assertEqual(books[0].lines[0].splitlines[1].amount, Decimal('6.0'))
+            self.assertEqual(
+                books[0].lines[0].splitlines[1].amount, Decimal('6.0'))
             self.assertEqual(
                 books[0].lines[0].splitlines[1].amount_2nd_currency,
                 None)
@@ -2545,7 +2658,8 @@ class CbInvTestCase(object):
                 ' | Open | -4.00 u]|2.50 u')
             self.assertEqual(books[0].lines[0].reference, None)
 
-            self.assertEqual(books[1].rec_name, 'Book 2 | 6.00 usd | Open | 2.50 u')
+            self.assertEqual(
+                books[1].rec_name, 'Book 2 | 6.00 usd | Open | 2.50 u')
             self.assertEqual(books[1].balance_all, Decimal('6.0'))
             self.assertEqual(len(books[1].lines), 1)
             self.assertEqual(
@@ -2642,7 +2756,8 @@ class CbInvTestCase(object):
                 books[0].lines[0].splitlines[0].rec_name,
                 'Exp/Sp|5.00 usd|to category [Cat1]')
             self.assertEqual(books[0].lines[0].splitlines[0].quantity, None)
-            self.assertEqual(books[0].lines[0].splitlines[0].quantity_2nd_uom, None)
+            self.assertEqual(
+                books[0].lines[0].splitlines[0].quantity_2nd_uom, None)
             self.assertEqual(
                 books[0].lines[0].splitlines[1].rec_name,
                 'Exp/Sp|6.00 usd|to cashbook [Book Asset | 0.00 usd | ' +
@@ -2650,7 +2765,8 @@ class CbInvTestCase(object):
             self.assertEqual(
                 books[0].lines[0].splitlines[1].quantity,
                 Decimal('2.5'))
-            self.assertEqual(books[0].lines[0].splitlines[1].quantity_2nd_uom, None)
+            self.assertEqual(
+                books[0].lines[0].splitlines[1].quantity_2nd_uom, None)
 
             self.assertEqual(len(books[0].lines[0].references), 0)
             self.assertEqual(books[0].lines[0].reference, None)
@@ -2662,6 +2778,7 @@ class CbInvTestCase(object):
             self.assertEqual(len(books[1].lines), 0)
 
             Line.wfcheck([books[0].lines[0]])
+            self.prep_valstore_run_worker()
 
             self.assertEqual(books[0].rec_name, 'Book Cash | -11.00 usd | Open')
             self.assertEqual(books[0].balance_all, Decimal('-11.0'))
@@ -2684,7 +2801,8 @@ class CbInvTestCase(object):
                 books[0].lines[0].splitlines[1].rec_name,
                 'Exp/Sp|6.00 usd|to cashbook [Book Asset | 6.00 usd' +
                 ' | Open | 2.50 u]')
-            self.assertEqual(books[0].lines[0].splitlines[1].amount, Decimal('6.0'))
+            self.assertEqual(
+                books[0].lines[0].splitlines[1].amount, Decimal('6.0'))
             self.assertEqual(
                 books[0].lines[0].splitlines[1].amount_2nd_currency,
                 None)
@@ -2853,6 +2971,7 @@ class CbInvTestCase(object):
             self.assertEqual(len(books[1].lines), 0)
 
             Line.wfcheck([books[0].lines[0]])
+            self.prep_valstore_run_worker()
 
             self.assertEqual(
                 books[0].rec_name,
@@ -2993,7 +3112,8 @@ class CbInvTestCase(object):
 
             self.assertRaisesRegex(
                 UserError,
-                r"Cannot transfer quantities between cashbooks with different unit-categories \(Weight != Volume\).",
+                r"Cannot transfer quantities between cashbooks with " +
+                r"different unit-categories \(Weight != Volume\).",
                 Book.write,
                 *[
                     [books[0]],

tests/test_module.py

@@ -10,9 +10,11 @@ from trytond.modules.investment.tests.test_module import InvestmentTestCase
 from .yieldtest import YieldTestCase
 from .book import CbInvTestCase
 from .reconciliation import ReconTestCase
+from .valuestore import ValueStoreTestCase
 
 
 class CashbookInvestmentTestCase(
+        ValueStoreTestCase,
         CashbookTestCase,
         InvestmentTestCase,
         CbInvTestCase,

tests/valuestore.py

@@ -0,0 +1,377 @@
+# -*- 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.
+
+from trytond.tests.test_tryton import with_transaction
+from trytond.pool import Pool
+from trytond.transaction import Transaction
+from datetime import date
+from decimal import Decimal
+
+
+class ValueStoreTestCase(object):
+    """ test update of cashbooks on update of asset
+    """
+    @with_transaction()
+    def test_valstore_update_asset_rate(self):
+        """ update rate of asset, should update cashbook
+        """
+        pool = Pool()
+        Book = pool.get('cashbook.book')
+        BType = pool.get('cashbook.type')
+        Asset = pool.get('investment.asset')
+        Queue = pool.get('ir.queue')
+        ValStore = pool.get('cashbook.values')
+
+        company = self.prep_company()
+        with Transaction().set_context({'company': company.id}):
+            types = self.prep_type()
+            BType.write(*[
+                [types],
+                {
+                    'feature': 'asset',
+                }])
+            category = self.prep_category(cattype='in')
+
+            party = self.prep_party()
+            asset = self.prep_asset_item(
+                company=company,
+                product=self.prep_asset_product(name='Product 1'))
+
+            Asset.write(*[
+                [asset],
+                {
+                    'rates': [('create', [{
+                        'date': date(2022, 5, 1),
+                        'rate': Decimal('2.5'),
+                        }, {
+                        'date': date(2022, 5, 2),
+                        'rate': Decimal('2.8'),
+                        }])],
+                }])
+            self.assertEqual(
+                asset.rec_name, 'Product 1 | 2.8000 usd/u | 05/02/2022')
+
+            (usd, euro) = self.prep_2nd_currency(company)
+            self.assertEqual(company.currency.rec_name, 'Euro')
+            self.assertEqual(asset.symbol, 'usd/u')
+
+            self.assertEqual(Queue.search_count([]), 0)
+
+            book, = Book.create([{
+                'start_date': date(2022, 4, 1),
+                'name': 'Book 1',
+                'btype': types.id,
+                'company': company.id,
+                'currency': euro.id,
+                'number_sequ': self.prep_sequence().id,
+                'asset': asset.id,
+                'quantity_uom': asset.uom.id,
+                'quantity_digits': 3,
+                'lines': [('create', [{
+                    'date': date(2022, 5, 1),
+                    'description': 'Text 1',
+                    'category': category.id,
+                    'bookingtype': 'in',
+                    'amount': Decimal('2.5'),
+                    'party': party.id,
+                    'quantity': Decimal('1.5'),
+                    }])],
+                }])
+
+            # run worker
+            self.assertEqual(
+                ValStore.search_count([]),
+                len(Book.valuestore_fields()))
+            self.prep_valstore_run_worker()
+
+            self.assertEqual(book.name, 'Book 1')
+            self.assertEqual(book.rec_name, 'Book 1 | 2.50 € | Open | 1.500 u')
+            self.assertEqual(len(book.lines), 1)
+            self.assertEqual(
+                book.lines[0].rec_name,
+                '05/01/2022|Rev|2.50 €|Text 1 [Cat1]|1.500 u')
+
+            values = ValStore.search([
+                ('cashbook', '=', book.id)], order=[('field_name', 'ASC')])
+            self.assertEqual(len(values), len(Book.valuestore_fields()))
+
+            self.assertEqual(
+                values[0].rec_name,
+                '[Book 1 | 2.50 € | Open | 1.500 u]|balance|2.50|2')
+            self.assertEqual(
+                values[1].rec_name,
+                '[Book 1 | 2.50 € | Open | 1.500 u]|balance_all|2.50|2')
+            self.assertEqual(
+                values[2].rec_name,
+                '[Book 1 | 2.50 € | Open | 1.500 u]|balance_ref|2.50|2')
+            self.assertEqual(
+                values[3].rec_name,
+                '[Book 1 | 2.50 € | Open | 1.500 u]|current_rate|2.67|2')
+            self.assertEqual(
+                values[4].rec_name,
+                '[Book 1 | 2.50 € | Open | 1.500 u]|current_value|4.00|2')
+            self.assertEqual(
+                values[5].rec_name,
+                '[Book 1 | 2.50 € | Open | 1.500 u]|current_value_ref|4.00|2')
+            self.assertEqual(
+                values[6].rec_name,
+                '[Book 1 | 2.50 € | Open | 1.500 u]|diff_amount|1.50|2')
+            self.assertEqual(
+                values[7].rec_name,
+                '[Book 1 | 2.50 € | Open | 1.500 u]|diff_percent|60.00|2')
+            self.assertEqual(
+                values[8].rec_name,
+                '[Book 1 | 2.50 € | Open | 1.500 u]|purchase_amount|2.50|2')
+            self.assertEqual(
+                values[9].rec_name,
+                '[Book 1 | 2.50 € | Open | 1.500 u]|quantity|1.500|3')
+            self.assertEqual(
+                values[10].rec_name,
+                '[Book 1 | 2.50 € | Open | 1.500 u]|quantity_all|1.500|3')
+            self.assertEqual(
+                values[11].rec_name,
+                '[Book 1 | 2.50 € | Open | 1.500 u]|yield_balance|4.00|2')
+            self.assertEqual(
+                values[12].rec_name,
+                '[Book 1 | 2.50 € | Open | 1.500 u]|yield_dividend_12m|0.00|2')
+            self.assertEqual(
+                values[13].rec_name,
+                '[Book 1 | 2.50 € | Open | 1.500 u]|yield_dividend_total|0.00|2')
+            self.assertEqual(
+                values[14].rec_name,
+                '[Book 1 | 2.50 € | Open | 1.500 u]|yield_fee_12m|0.00|2')
+            self.assertEqual(
+                values[15].rec_name,
+                '[Book 1 | 2.50 € | Open | 1.500 u]|yield_fee_total|0.00|2')
+            self.assertEqual(
+                values[16].rec_name,
+                '[Book 1 | 2.50 € | Open | 1.500 u]|yield_sales|2.50|2')
+            self.assertEqual(
+                values[17].rec_name,
+                '[Book 1 | 2.50 € | Open | 1.500 u]|yield_sales_12m|0.00|2')
+
+            # add rate
+            Asset.write(*[
+                [asset],
+                {
+                    'rates': [('create', [{
+                        'date': date(2022, 5, 10),
+                        'rate': Decimal('3.0'),
+                        }])],
+                }])
+            self.assertEqual(
+                asset.rec_name, 'Product 1 | 3.0000 usd/u | 05/10/2022')
+
+            # run worker
+            self.prep_valstore_run_worker()
+
+            values = ValStore.search([
+                ('cashbook', '=', book.id)], order=[('field_name', 'ASC')])
+            self.assertEqual(len(values), len(Book.valuestore_fields()))
+
+            self.assertEqual(
+                values[0].rec_name,
+                '[Book 1 | 2.50 € | Open | 1.500 u]|balance|2.50|2')
+            self.assertEqual(
+                values[1].rec_name,
+                '[Book 1 | 2.50 € | Open | 1.500 u]|balance_all|2.50|2')
+            self.assertEqual(
+                values[2].rec_name,
+                '[Book 1 | 2.50 € | Open | 1.500 u]|balance_ref|2.50|2')
+            self.assertEqual(
+                values[3].rec_name,
+                '[Book 1 | 2.50 € | Open | 1.500 u]|current_rate|2.86|2')
+            self.assertEqual(
+                values[4].rec_name,
+                '[Book 1 | 2.50 € | Open | 1.500 u]|current_value|4.29|2')
+            self.assertEqual(
+                values[5].rec_name,
+                '[Book 1 | 2.50 € | Open | 1.500 u]|current_value_ref|4.29|2')
+            self.assertEqual(
+                values[6].rec_name,
+                '[Book 1 | 2.50 € | Open | 1.500 u]|diff_amount|1.79|2')
+            self.assertEqual(
+                values[7].rec_name,
+                '[Book 1 | 2.50 € | Open | 1.500 u]|diff_percent|71.60|2')
+            self.assertEqual(
+                values[8].rec_name,
+                '[Book 1 | 2.50 € | Open | 1.500 u]|purchase_amount|2.50|2')
+            self.assertEqual(
+                values[9].rec_name,
+                '[Book 1 | 2.50 € | Open | 1.500 u]|quantity|1.500|3')
+            self.assertEqual(
+                values[10].rec_name,
+                '[Book 1 | 2.50 € | Open | 1.500 u]|quantity_all|1.500|3')
+            self.assertEqual(
+                values[11].rec_name,
+                '[Book 1 | 2.50 € | Open | 1.500 u]|yield_balance|4.29|2')
+            self.assertEqual(
+                values[12].rec_name,
+                '[Book 1 | 2.50 € | Open | 1.500 u]|yield_dividend_12m|0.00|2')
+            self.assertEqual(
+                values[13].rec_name,
+                '[Book 1 | 2.50 € | Open | 1.500 u]|yield_dividend_total|0.00|2')
+            self.assertEqual(
+                values[14].rec_name,
+                '[Book 1 | 2.50 € | Open | 1.500 u]|yield_fee_12m|0.00|2')
+            self.assertEqual(
+                values[15].rec_name,
+                '[Book 1 | 2.50 € | Open | 1.500 u]|yield_fee_total|0.00|2')
+            self.assertEqual(
+                values[16].rec_name,
+                '[Book 1 | 2.50 € | Open | 1.500 u]|yield_sales|2.50|2')
+            self.assertEqual(
+                values[17].rec_name,
+                '[Book 1 | 2.50 € | Open | 1.500 u]|yield_sales_12m|0.00|2')
+
+            # update rate
+            self.assertEqual(asset.rates[0].rate, Decimal('3.0'))
+            self.assertEqual(asset.rates[0].date, date(2022, 5, 10))
+            Asset.write(*[
+                [asset],
+                {
+                    'rates': [('write', [asset.rates[0]], {
+                        'rate': Decimal('3.5'),
+                        })],
+                }])
+            self.assertEqual(
+                asset.rec_name, 'Product 1 | 3.5000 usd/u | 05/10/2022')
+
+            # run worker
+            self.prep_valstore_run_worker()
+
+            values = ValStore.search([
+                ('cashbook', '=', book.id)], order=[('field_name', 'ASC')])
+            self.assertEqual(len(values), len(Book.valuestore_fields()))
+
+            self.assertEqual(
+                values[0].rec_name,
+                '[Book 1 | 2.50 € | Open | 1.500 u]|balance|2.50|2')
+            self.assertEqual(
+                values[1].rec_name,
+                '[Book 1 | 2.50 € | Open | 1.500 u]|balance_all|2.50|2')
+            self.assertEqual(
+                values[2].rec_name,
+                '[Book 1 | 2.50 € | Open | 1.500 u]|balance_ref|2.50|2')
+            self.assertEqual(
+                values[3].rec_name,
+                '[Book 1 | 2.50 € | Open | 1.500 u]|current_rate|3.33|2')
+            self.assertEqual(
+                values[4].rec_name,
+                '[Book 1 | 2.50 € | Open | 1.500 u]|current_value|5.00|2')
+            self.assertEqual(
+                values[5].rec_name,
+                '[Book 1 | 2.50 € | Open | 1.500 u]|current_value_ref|5.00|2')
+            self.assertEqual(
+                values[6].rec_name,
+                '[Book 1 | 2.50 € | Open | 1.500 u]|diff_amount|2.50|2')
+            self.assertEqual(
+                values[7].rec_name,
+                '[Book 1 | 2.50 € | Open | 1.500 u]|diff_percent|100.00|2')
+            self.assertEqual(
+                values[8].rec_name,
+                '[Book 1 | 2.50 € | Open | 1.500 u]|purchase_amount|2.50|2')
+            self.assertEqual(
+                values[9].rec_name,
+                '[Book 1 | 2.50 € | Open | 1.500 u]|quantity|1.500|3')
+            self.assertEqual(
+                values[10].rec_name,
+                '[Book 1 | 2.50 € | Open | 1.500 u]|quantity_all|1.500|3')
+            self.assertEqual(
+                values[11].rec_name,
+                '[Book 1 | 2.50 € | Open | 1.500 u]|yield_balance|5.00|2')
+            self.assertEqual(
+                values[12].rec_name,
+                '[Book 1 | 2.50 € | Open | 1.500 u]|yield_dividend_12m|0.00|2')
+            self.assertEqual(
+                values[13].rec_name,
+                '[Book 1 | 2.50 € | Open | 1.500 u]|yield_dividend_total|0.00|2')
+            self.assertEqual(
+                values[14].rec_name,
+                '[Book 1 | 2.50 € | Open | 1.500 u]|yield_fee_12m|0.00|2')
+            self.assertEqual(
+                values[15].rec_name,
+                '[Book 1 | 2.50 € | Open | 1.500 u]|yield_fee_total|0.00|2')
+            self.assertEqual(
+                values[16].rec_name,
+                '[Book 1 | 2.50 € | Open | 1.500 u]|yield_sales|2.50|2')
+            self.assertEqual(
+                values[17].rec_name,
+                '[Book 1 | 2.50 € | Open | 1.500 u]|yield_sales_12m|0.00|2')
+
+            # delete rate
+            self.assertEqual(asset.rates[0].rate, Decimal('3.5'))
+            self.assertEqual(asset.rates[0].date, date(2022, 5, 10))
+            Asset.write(*[
+                [asset],
+                {
+                    'rates': [('delete', [asset.rates[0].id])],
+                }])
+            self.assertEqual(
+                asset.rec_name, 'Product 1 | 2.8000 usd/u | 05/02/2022')
+
+            # run worker
+            self.prep_valstore_run_worker()
+
+            values = ValStore.search([
+                ('cashbook', '=', book.id)], order=[('field_name', 'ASC')])
+            self.assertEqual(len(values), len(Book.valuestore_fields()))
+
+            self.assertEqual(
+                values[0].rec_name,
+                '[Book 1 | 2.50 € | Open | 1.500 u]|balance|2.50|2')
+            self.assertEqual(
+                values[1].rec_name,
+                '[Book 1 | 2.50 € | Open | 1.500 u]|balance_all|2.50|2')
+            self.assertEqual(
+                values[2].rec_name,
+                '[Book 1 | 2.50 € | Open | 1.500 u]|balance_ref|2.50|2')
+            self.assertEqual(
+                values[3].rec_name,
+                '[Book 1 | 2.50 € | Open | 1.500 u]|current_rate|2.67|2')
+            self.assertEqual(
+                values[4].rec_name,
+                '[Book 1 | 2.50 € | Open | 1.500 u]|current_value|4.00|2')
+            self.assertEqual(
+                values[5].rec_name,
+                '[Book 1 | 2.50 € | Open | 1.500 u]|current_value_ref|4.00|2')
+            self.assertEqual(
+                values[6].rec_name,
+                '[Book 1 | 2.50 € | Open | 1.500 u]|diff_amount|1.50|2')
+            self.assertEqual(
+                values[7].rec_name,
+                '[Book 1 | 2.50 € | Open | 1.500 u]|diff_percent|60.00|2')
+            self.assertEqual(
+                values[8].rec_name,
+                '[Book 1 | 2.50 € | Open | 1.500 u]|purchase_amount|2.50|2')
+            self.assertEqual(
+                values[9].rec_name,
+                '[Book 1 | 2.50 € | Open | 1.500 u]|quantity|1.500|3')
+            self.assertEqual(
+                values[10].rec_name,
+                '[Book 1 | 2.50 € | Open | 1.500 u]|quantity_all|1.500|3')
+            self.assertEqual(
+                values[11].rec_name,
+                '[Book 1 | 2.50 € | Open | 1.500 u]|yield_balance|4.00|2')
+            self.assertEqual(
+                values[12].rec_name,
+                '[Book 1 | 2.50 € | Open | 1.500 u]|yield_dividend_12m|0.00|2')
+            self.assertEqual(
+                values[13].rec_name,
+                '[Book 1 | 2.50 € | Open | 1.500 u]|yield_dividend_total|0.00|2')
+            self.assertEqual(
+                values[14].rec_name,
+                '[Book 1 | 2.50 € | Open | 1.500 u]|yield_fee_12m|0.00|2')
+            self.assertEqual(
+                values[15].rec_name,
+                '[Book 1 | 2.50 € | Open | 1.500 u]|yield_fee_total|0.00|2')
+            self.assertEqual(
+                values[16].rec_name,
+                '[Book 1 | 2.50 € | Open | 1.500 u]|yield_sales|2.50|2')
+            self.assertEqual(
+                values[17].rec_name,
+                '[Book 1 | 2.50 € | Open | 1.500 u]|yield_sales_12m|0.00|2')
+
+# end ValueStoreTestCase

tests/yieldtest.py

@@ -152,6 +152,7 @@ class YieldTestCase(object):
 
             self.assertEqual(len(lines), 1)
             Line.wfcheck(lines)
+            self.prep_valstore_run_worker()
 
             self.assertEqual(
                 lines[0].rec_name,
@@ -257,6 +258,7 @@ class YieldTestCase(object):
                 }])
 
             Line.wfcheck(book_cash.lines)
+            self.prep_valstore_run_worker()
 
             self.assertEqual(
                 book_asset.rec_name,
@@ -366,6 +368,7 @@ class YieldTestCase(object):
                 }])
 
             Line.wfcheck(book_asset.lines)
+            self.prep_valstore_run_worker()
 
             self.assertEqual(
                 book_asset.rec_name,
@@ -451,6 +454,7 @@ class YieldTestCase(object):
 
             self.assertEqual(len(lines), 1)
             Line.wfcheck(lines)
+            self.prep_valstore_run_worker()
 
             self.assertEqual(
                 lines[0].rec_name,
@@ -532,6 +536,7 @@ class YieldTestCase(object):
 
             self.assertEqual(len(lines), 1)
             Line.wfcheck(lines)
+            self.prep_valstore_run_worker()
 
             self.assertEqual(
                 lines[0].rec_name,
@@ -631,6 +636,7 @@ class YieldTestCase(object):
                 }])
 
             Line.wfcheck(book_cash.lines)
+            self.prep_valstore_run_worker()
 
             self.assertEqual(
                 book_asset.rec_name,
@@ -743,6 +749,7 @@ class YieldTestCase(object):
                 }])
 
             Line.wfcheck(book_asset.lines)
+            self.prep_valstore_run_worker()
 
             self.assertEqual(
                 book_asset.rec_name,
@@ -879,6 +886,7 @@ class YieldTestCase(object):
                 lines[0].rec_name,
                 '05/02/2022|Exp/Sp|-23.50 usd|all out (1) [-]|-3.0000 u')
             Line.wfcheck(lines)
+            self.prep_valstore_run_worker()
 
             self.assertEqual(
                 lines[0].rec_name,
@@ -1007,6 +1015,7 @@ class YieldTestCase(object):
 
             self.assertEqual(len(lines), 2)
             Line.wfcheck(lines)
+            self.prep_valstore_run_worker()
 
             self.assertEqual(
                 lines[0].rec_name,
@@ -1150,6 +1159,7 @@ class YieldTestCase(object):
 
             self.assertEqual(len(lines), 1)
             Line.wfcheck(lines)
+            self.prep_valstore_run_worker()
 
             self.assertEqual(
                 lines[0].rec_name,
@@ -1301,6 +1311,7 @@ class YieldTestCase(object):
 
             self.assertEqual(len(lines), 3)
             Line.wfcheck(lines)
+            self.prep_valstore_run_worker()
 
             self.assertEqual(
                 lines[0].rec_name,
@@ -1438,6 +1449,7 @@ class YieldTestCase(object):
 
             self.assertEqual(len(lines), 2)
             Line.wfcheck(lines)
+            self.prep_valstore_run_worker()
 
             self.assertEqual(
                 lines[0].rec_name,

tryton.cfg

@@ -1,5 +1,5 @@
 [tryton]
-version=6.8.10
+version=6.8.14
 depends:
     cashbook
     investment
@@ -11,3 +11,4 @@ xml:
     splitline.xml
     assetsetting.xml
     menu.xml
+

valuestore.py

@@ -0,0 +1,26 @@
+# -*- 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.
+
+
+from trytond.pool import PoolMeta
+
+
+class ValueStore(metaclass=PoolMeta):
+    __name__ = 'cashbook.values'
+
+    @classmethod
+    def _maintenance_fields(cls):
+        """ add fields to update job
+        """
+        result = super(ValueStore, cls)._maintenance_fields()
+        result.extend([
+            'quantity', 'current_value', 'current_value_ref',
+            'diff_amount', 'diff_percent', 'current_rate',
+            'purchase_amount', 'yield_fee_total', 'yield_dividend_total',
+            'yield_sales', 'yield_fee_12m', 'yield_dividend_12m',
+            'yield_sales_12m'])
+        return result
+
+# end ValueStore

versiondep.txt

@@ -1 +1 @@
-cashbook;6.8.28;6.8.999;mds
+cashbook;6.8.33;6.8.999;mds

view/book_list.xml

@@ -5,10 +5,20 @@ full copyright notices and license terms. -->
 <data>
 
     <xpath expr="/tree/field[@name='balance']" position="after">
-        <field name="current_value" symbol="currency"/>
-        <field name="diff_amount" symbol="currency"/>
-        <field name="diff_percent"/>
-        <field name="quantity" symbol="quantity_uom"/>
+        <field name="current_value" symbol="currency" optional="0"/>
+        <field name="current_value_ref" symbol="company_currency" optional="1"/>
+        <field name="purchase_amount" symbol="currency" optional="1"/>
+        <field name="diff_amount" symbol="currency" optional="0"/>
+        <field name="yield_balance" symbol="currency" optional="1"/>
+        <field name="diff_percent" optional="0"/>
+        <field name="quantity" symbol="quantity_uom" optional="0"/>
+        <field name="quantity_all" symbol="quantity_uom" optional="1"/>
+        <field name="yield_sales" symbol="currency" optional="1"/>
+        <field name="yield_sales_12m" symbol="currency" optional="1"/>
+        <field name="yield_dividend_total" symbol="currency" optional="1"/>
+        <field name="yield_dividend_12m" symbol="currency" optional="1"/>
+        <field name="yield_fee_total" symbol="currency" optional="1"/>
+        <field name="yield_fee_12m" symbol="currency" optional="1"/>
     </xpath>
 
 </data>

view/book_tree.xml

@@ -5,8 +5,20 @@ full copyright notices and license terms. -->
 <data>
 
     <xpath expr="/tree/field[@name='balance']" position="after">
-        <field name="diff_amount" symbol="currency"/>
-        <field name="diff_percent"/>
+        <field name="current_value" symbol="currency" optional="1"/>
+        <field name="current_value_ref" symbol="company_currency" optional="1"/>
+        <field name="purchase_amount" symbol="currency" optional="1"/>
+        <field name="diff_amount" symbol="currency" optional="0"/>
+        <field name="yield_balance" symbol="currency" optional="1"/>
+        <field name="diff_percent" optional="0"/>
+        <field name="quantity" symbol="quantity_uom" optional="1"/>
+        <field name="quantity_all" symbol="quantity_uom" optional="1"/>
+        <field name="yield_sales" symbol="currency" optional="1"/>
+        <field name="yield_sales_12m" symbol="currency" optional="1"/>
+        <field name="yield_dividend_total" symbol="currency" optional="1"/>
+        <field name="yield_dividend_12m" symbol="currency" optional="1"/>
+        <field name="yield_fee_total" symbol="currency" optional="1"/>
+        <field name="yield_fee_12m" symbol="currency" optional="1"/>
     </xpath>
 
 </data>

view/line_list.xml

@@ -5,9 +5,9 @@ full copyright notices and license terms. -->
 <data>
 
     <xpath expr="/tree/field[@name='balance']" position="after">
-        <field name="quantity_credit"/>
-        <field name="quantity_debit"/>
-        <field name="quantity_balance"/>
+        <field name="quantity_credit" optional="0"/>
+        <field name="quantity_debit" optional="0"/>
+        <field name="quantity_balance" optional="0"/>
     </xpath>
 
 </data>

view/recon_list.xml

@@ -5,7 +5,7 @@ full copyright notices and license terms. -->
 <data>
 
     <xpath expr="/tree/field[@name='end_amount']" position="after">
-        <field name="start_quantity"/>
-        <field name="end_quantity"/>
+        <field name="start_quantity" optional="0"/>
+        <field name="end_quantity" optional="0"/>
     </xpath>
 </data>

view/split_list.xml

@@ -5,8 +5,8 @@ full copyright notices and license terms. -->
 <data>
 
     <xpath expr="/tree/field[@name='amount_2nd_currency']" position="after">
-        <field name="quantity" symbol="quantity_uom"/>
-        <field name="quantity_2nd_uom" symbol="quantity2nd"/>
+        <field name="quantity" symbol="quantity_uom" optional="0"/>
+        <field name="quantity_2nd_uom" symbol="quantity2nd" optional="0"/>
     </xpath>
 
 </data>