changeset 92098bd1ad6a in modules/sale_secondary_unit:default
details:
https://hg.tryton.org/modules/sale_secondary_unit?cmd=changeset;node=92098bd1ad6a
description:
Add secondary unit
issue8239
review271131003
diffstat:
.drone.yml | 45 ++
COPYRIGHT | 15 +
LICENSE | 674 +++++++++++++++++++++++++++++++++
MANIFEST.in | 5 +
README.rst | 1 +
__init__.py | 29 +
account.py | 35 +
doc/index.rst | 12 +
message.xml | 10 +
product.py | 148 +++++++
product.xml | 20 +
sale.py | 207 ++++++++++
sale.xml | 24 +
setup.py | 132 ++++++
stock.py | 35 +
stock.xml | 12 +
tests/__init__.py | 9 +
tests/scenario_sale_secondary_unit.rst | 132 ++++++
tests/test_sale_secondary_unit.py | 31 +
tox.ini | 15 +
tryton.cfg | 18 +
view/product_customer_form.xml | 15 +
view/product_template_form.xml | 16 +
view/sale_line_form.xml | 15 +
view/sale_line_tree.xml | 10 +
view/stock_move_list.xml | 9 +
26 files changed, 1674 insertions(+), 0 deletions(-)
diffs (1779 lines):
diff -r 000000000000 -r 92098bd1ad6a .drone.yml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/.drone.yml Sun Jul 28 14:34:20 2019 +0200
@@ -0,0 +1,45 @@
+clone:
+ hg:
+ image: plugins/hg
+
+pipeline:
+ tox:
+ image: ${IMAGE}
+ environment:
+ - CFLAGS=-O0
+ - DB_CACHE=/cache
+ - TOX_TESTENV_PASSENV=CFLAGS DB_CACHE
+ - POSTGRESQL_URI=postgresql://postgres@postgresql:5432/
+ commands:
+ - pip install tox
+ - tox -e "${TOXENV}-${DATABASE}"
+ volumes:
+ - cache:/root/.cache
+
+services:
+ postgresql:
+ image: postgres
+ when:
+ matrix:
+ DATABASE: postgresql
+
+matrix:
+ include:
+ - IMAGE: python:3.5
+ TOXENV: py35
+ DATABASE: sqlite
+ - IMAGE: python:3.5
+ TOXENV: py35
+ DATABASE: postgresql
+ - IMAGE: python:3.6
+ TOXENV: py36
+ DATABASE: sqlite
+ - IMAGE: python:3.6
+ TOXENV: py36
+ DATABASE: postgresql
+ - IMAGE: python:3.7
+ TOXENV: py37
+ DATABASE: sqlite
+ - IMAGE: python:3.7
+ TOXENV: py37
+ DATABASE: postgresql
diff -r 000000000000 -r 92098bd1ad6a COPYRIGHT
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/COPYRIGHT Sun Jul 28 14:34:20 2019 +0200
@@ -0,0 +1,15 @@
+Copyright (C) 2019 Cédric Krier
+Copyright (C) 2019 B2CK
+
+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/>.
diff -r 000000000000 -r 92098bd1ad6a LICENSE
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/LICENSE Sun Jul 28 14:34:20 2019 +0200
@@ -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>.
diff -r 000000000000 -r 92098bd1ad6a MANIFEST.in
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/MANIFEST.in Sun Jul 28 14:34:20 2019 +0200
@@ -0,0 +1,5 @@
+include CHANGELOG
+include COPYRIGHT
+include LICENSE
+include README.rst
+include doc/*
diff -r 000000000000 -r 92098bd1ad6a README.rst
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/README.rst Sun Jul 28 14:34:20 2019 +0200
@@ -0,0 +1,1 @@
+doc/index.rst
\ No newline at end of file
diff -r 000000000000 -r 92098bd1ad6a __init__.py
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/__init__.py Sun Jul 28 14:34:20 2019 +0200
@@ -0,0 +1,29 @@
+# This file is part of Tryton. The COPYRIGHT file at the top level of
+# this repository contains the full copyright notices and license terms.
+
+from trytond.pool import Pool
+from . import account
+from . import product
+from . import sale
+from . import stock
+
+__all__ = ['register']
+
+
+def register():
+ Pool.register(
+ account.InvoiceLine,
+ product.Template,
+ product.Product,
+ sale.Line,
+ stock.Move,
+ module='sale_secondary_unit', type_='model')
+ Pool.register(
+ product.ProductCustomer,
+ sale.Line_ProductCustomer,
+ module='sale_secondary_unit', type_='model',
+ depends=['sale_product_customer'])
+ Pool.register(
+ sale.OpportunityLine,
+ module='sale_secondary_unit', type_='model',
+ depends=['sale_opportunity'])
diff -r 000000000000 -r 92098bd1ad6a account.py
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/account.py Sun Jul 28 14:34:20 2019 +0200
@@ -0,0 +1,35 @@
+# This file is part of Tryton. The COPYRIGHT file at the top level of
+# this repository contains the full copyright notices and license terms.
+
+from trytond.pool import PoolMeta, Pool
+
+
+class InvoiceLine(metaclass=PoolMeta):
+ __name__ = 'account.invoice.line'
+
+ def get_product_secondary_uom_category(self, name):
+ pool = Pool()
+ SaleLine = pool.get('sale.line')
+ category = super().get_product_secondary_uom_category(name)
+ if isinstance(self.origin, SaleLine):
+ if self.origin.secondary_unit:
+ category = self.origin.secondary_unit.category.id
+ return category
+
+ @property
+ def secondary_uom_factor(self):
+ pool = Pool()
+ SaleLine = pool.get('sale.line')
+ factor = super().secondary_uom_factor
+ if isinstance(self.origin, SaleLine):
+ factor = self.origin.secondary_uom_factor
+ return factor
+
+ @property
+ def secondary_uom_rate(self):
+ pool = Pool()
+ SaleLine = pool.get('sale.line')
+ factor = super().secondary_uom_rate
+ if isinstance(self.origin, SaleLine):
+ factor = self.origin.secondary_uom_rate
+ return factor
diff -r 000000000000 -r 92098bd1ad6a doc/index.rst
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/doc/index.rst Sun Jul 28 14:34:20 2019 +0200
@@ -0,0 +1,12 @@
+Sale Secondary Unit Module
+##########################
+
+The sale secondary unit module adds a secondary unit of measure on sale lines.
+The secondary quantity and unit price are kept synchronized with the quantity
+and unit price.
+The secondary unit is defined on the product with its factor against the sale
+unit.
+
+If the sale product customer module is activated, a specific secondary unit may
+be defined on the product customer. And it overrides the definition on the
+product.
diff -r 000000000000 -r 92098bd1ad6a message.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/message.xml Sun Jul 28 14:34:20 2019 +0200
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<tryton>
+ <data group="1">
+ <record model="ir.message"
id="msg_sale_secondary_uom_incompatible_factor_rate">
+ <field name="text">Incompatible sale secondary factor and rate
values for "%(record)s".</field>
+ </record>
+ </data>
+</tryton>
diff -r 000000000000 -r 92098bd1ad6a product.py
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/product.py Sun Jul 28 14:34:20 2019 +0200
@@ -0,0 +1,148 @@
+# This file is part of Tryton. The COPYRIGHT file at the top level of
+# this repository contains the full copyright notices and license terms.
+
+from trytond.i18n import gettext
+from trytond.model import fields
+from trytond.pool import PoolMeta
+from trytond.pyson import Eval, Bool
+
+from trytond.modules.product import uom_conversion_digits
+from trytond.modules.product.exceptions import UOMValidationError
+
+
+class SaleSecondaryMixin:
+ sale_secondary_uom = fields.Many2One(
+ 'product.uom', "Sale Secondary UOM",
+ domain=[
+ ('category', '!=', Eval('default_uom_category')),
+ ],
+ depends=['default_uom_category'])
+ sale_secondary_uom_factor = fields.Float(
+ "Sale Secondary UOM Factor", digits=uom_conversion_digits,
+ states={
+ 'required': Bool(Eval('sale_secondary_uom')),
+ 'invisible': ~Eval('sale_secondary_uom'),
+ },
+ depends=['sale_secondary_uom'],
+ help="The coefficient for the formula:\n"
+ "coefficient (sale unit) = 1 (secondary unit)")
+ sale_secondary_uom_rate = fields.Float(
+ "Sale Secondary UOM Rate", digits=uom_conversion_digits,
+ states={
+ 'required': Bool(Eval('sale_secondary_uom')),
+ 'invisible': ~Eval('sale_secondary_uom'),
+ },
+ depends=['sale_secondary_uom'],
+ help="The coefficient for the formula:\n"
+ "1 (sale unit) = coefficient (secondary unit)")
+
+ @fields.depends('sale_secondary_uom_factor')
+ def on_change_sale_secondary_uom_factor(self):
+ if not self.sale_secondary_uom_factor:
+ self.sale_secondary_uom_rate = None
+ else:
+ self.sale_secondary_uom_rate = round(
+ 1. / self.sale_secondary_uom_factor, uom_conversion_digits[1])
+
+ @fields.depends('sale_secondary_uom_rate')
+ def on_change_sale_secondary_uom_rate(self):
+ if not self.sale_secondary_uom_rate:
+ self.sale_secondary_uom_factor = None
+ else:
+ self.sale_secondary_uom_factor = round(
+ 1. / self.sale_secondary_uom_rate, uom_conversion_digits[1])
+
+ @property
+ def sale_secondary_uom_normal_rate(self):
+ uom = self.sale_secondary_uom
+ rate = self.sale_secondary_uom_rate
+ if self.sale_uom and rate and uom:
+ if self.sale_uom.accurate_field == 'factor':
+ rate *= self.sale_uom.factor
+ else:
+ rate /= self.sale_uom.rate
+ if uom.accurate_field == 'factor':
+ rate /= uom.factor
+ else:
+ rate *= uom.rate
+ return rate
+
+ @property
+ def sale_secondary_uom_normal_factor(self):
+ uom = self.sale_secondary_uom
+ factor = self.sale_secondary_uom_factor
+ if uom and factor and self.sale_uom:
+ if uom.accurate_field == 'factor':
+ factor *= uom.factor
+ else:
+ factor /= uom.rate
+ if self.sale_uom.accurate_field == 'factor':
+ factor /= self.sale_uom.factor
+ else:
+ factor *= self.sale_uom.rate
+ return factor
+
+ @classmethod
+ def validate(cls, records):
+ super().validate(records)
+ for record in records:
+ record.check_sale_secondary_uom_factor_and_rate()
+
+ def check_sale_secondary_uom_factor_and_rate(self):
+ factor = self.sale_secondary_uom_factor
+ rate = self.sale_secondary_uom_rate
+ if factor and rate:
+ if ((rate != round(1. / factor, uom_conversion_digits[1]))
+ and factor != round(1. / rate, uom_conversion_digits[1])):
+ raise UOMValidationError(
+ gettext('sale_secondary_unit'
+ '.msg_sale_secondary_uom_incompatible_factor_rate',
+ record=self))
+
+
+class Template(SaleSecondaryMixin, metaclass=PoolMeta):
+ __name__ = 'product.template'
+
+ @classmethod
+ def __setup__(cls):
+ super().__setup__()
+ cls.sale_secondary_uom.states = {
+ 'readonly': ~Eval('active', True),
+ 'invisible': ~Eval('salable', False),
+ }
+ cls.sale_secondary_uom.depends += ['active', 'salable']
+
+
+class Product(metaclass=PoolMeta):
+ __name__ = 'product.product'
+
+ @property
+ def sale_secondary_uom_normal_rate(self):
+ return self.template.sale_secondary_uom_normal_rate
+
+ @property
+ def sale_secondary_uom_normal_factor(self):
+ return self.template.sale_secondary_uom_normal_factor
+
+
+class ProductCustomer(SaleSecondaryMixin, metaclass=PoolMeta):
+ __name__ = 'sale.product_customer'
+
+ default_uom_category = fields.Function(
+ fields.Many2One('product.uom.category', "Default UOM Category"),
+ 'on_change_with_default_uom_category')
+
+ @fields.depends('template', '_parent_template.purchase_uom',
+ 'product', '_parent_product.purchase_uom')
+ def on_change_with_default_uom_category(self, name=None):
+ if self.product and self.product.purchase_uom:
+ return self.product.purchase_uom.category.id
+ elif self.template and self.template.purchase_uom:
+ return self.template.purchase_uom.category.id
+
+ @property
+ def sale_uom(self):
+ if self.product and self.product.sale_uom:
+ return self.product.sale_uom
+ elif self.template and self.template.sale_uom:
+ return self.template.sale_uom
diff -r 000000000000 -r 92098bd1ad6a product.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/product.xml Sun Jul 28 14:34:20 2019 +0200
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<tryton>
+ <data>
+ <record model="ir.ui.view" id="template_view_form">
+ <field name="model">product.template</field>
+ <field name="inherit" ref="product.template_view_form"/>
+ <field name="name">product_template_form</field>
+ </record>
+ </data>
+
+ <data depends="sale_product_customer">
+ <record model="ir.ui.view" id="product_customer_view_form">
+ <field name="model">sale.product_customer</field>
+ <field name="inherit"
ref="sale_product_customer.product_customer_view_form"/>
+ <field name="name">product_customer_form</field>
+ </record>
+ </data>
+</tryton>
diff -r 000000000000 -r 92098bd1ad6a sale.py
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sale.py Sun Jul 28 14:34:20 2019 +0200
@@ -0,0 +1,207 @@
+# This file is part of Tryton. The COPYRIGHT file at the top level of
+# this repository contains the full copyright notices and license terms.
+from decimal import Decimal
+
+from trytond.model import fields
+from trytond.pool import PoolMeta, Pool
+from trytond.pyson import Eval, If
+
+from trytond.modules.product import price_digits
+
+
+class Line(metaclass=PoolMeta):
+ __name__ = 'sale.line'
+
+ secondary_quantity = fields.Function(
+ fields.Float("Secondary Quantity",
+ digits=(16, Eval('secondary_unit_digits', 2)),
+ states={
+ 'invisible': ((Eval('type') != 'line')
+ | ~Eval('secondary_unit')),
+ 'readonly': Eval('sale_state') != 'draft',
+ },
+ depends=[
+ 'secondary_unit_digits', 'type', 'secondary_unit',
+ 'sale_state']),
+ 'on_change_with_secondary_quantity', setter='set_secondary')
+ secondary_unit = fields.Many2One(
+ 'product.uom', "Secondary Unit", ondelete='RESTRICT',
+ domain=[
+ If(Eval('sale_state') == 'draft',
+ ('category', '=', Eval('product_secondary_uom_category')),
+ ()),
+ ],
+ states={
+ 'invisible': ((Eval('type') != 'line')
+ | (~Eval('secondary_uom_factor')
+ & ~Eval('secondary_uom_rate'))),
+ 'readonly': Eval('sale_state') != 'draft',
+ },
+ depends=['product_secondary_uom_category', 'type',
+ 'secondary_uom_factor', 'secondary_uom_rate', 'sale_state'])
+ secondary_unit_price = fields.Function(
+ fields.Numeric(
+ "Secondary Unit Price", digits=price_digits,
+ states={
+ 'invisible': ((Eval('type') != 'line')
+ | ~Eval('secondary_unit')),
+ 'readonly': Eval('sale_state') != 'draft',
+ },
+ depends=['type', 'secondary_unit', 'sale_state']),
+ 'on_change_with_secondary_unit_price', setter='set_secondary')
+
+ secondary_uom_factor = fields.Float("Secondary UOM Factor")
+ secondary_uom_rate = fields.Float("Secondary UOM Rate")
+
+ secondary_unit_digits = fields.Function(
+ fields.Integer("Secondary Unit Digits"),
+ 'on_change_with_secondary_unit_digits')
+ product_secondary_uom_category = fields.Function(
+ fields.Many2One(
+ 'product.uom.category', "Product Secondary UOM Category"),
+ 'on_change_with_product_secondary_uom_category')
+
+ @fields.depends('product')
+ def _secondary_record(self):
+ if self.product and self.product.sale_secondary_uom:
+ return self.product
+
+ @fields.depends('quantity', 'unit', 'secondary_unit',
+ 'secondary_uom_factor', 'secondary_uom_rate')
+ def on_change_with_secondary_quantity(self, name=None):
+ pool = Pool()
+ Uom = pool.get('product.uom')
+ if (self.quantity and self.unit and self.secondary_unit
+ and (self.secondary_uom_factor or self.secondary_uom_rate)):
+ return Uom.compute_qty(
+ self.unit, self.quantity,
+ self.secondary_unit, round=True,
+ factor=self.secondary_uom_factor, rate=self.secondary_uom_rate)
+ else:
+ return None
+
+ @fields.depends('secondary_quantity', 'secondary_unit', 'unit',
+ 'secondary_uom_factor', 'secondary_uom_rate',
+ methods=['on_change_quantity', 'on_change_with_amount'])
+ def on_change_secondary_quantity(self):
+ pool = Pool()
+ Uom = pool.get('product.uom')
+ if (self.secondary_quantity and self.secondary_unit and self.unit
+ and (self.secondary_uom_factor or self.secondary_uom_rate)):
+ self.quantity = Uom.compute_qty(
+ self.secondary_unit, self.secondary_quantity,
+ self.unit, round=True,
+ factor=self.secondary_uom_rate, rate=self.secondary_uom_factor)
+ self.on_change_quantity()
+ self.amount = self.on_change_with_amount()
+
+ @fields.depends('unit_price', 'unit', 'secondary_unit',
+ 'secondary_uom_factor', 'secondary_uom_rate')
+ def on_change_with_secondary_unit_price(self, name=None):
+ pool = Pool()
+ Uom = pool.get('product.uom')
+ if (self.unit_price is not None and self.unit and self.secondary_unit
+ and (self.secondary_uom_factor or self.secondary_uom_rate)):
+ return Uom.compute_price(
+ self.unit, self.unit_price, self.secondary_unit,
+ factor=self.secondary_uom_factor, rate=self.secondary_uom_rate
+ ).quantize(Decimal(1) / 10 ** price_digits[1])
+ else:
+ return None
+
+ @fields.depends('secondary_unit_price', 'secondary_unit', 'unit',
+ 'secondary_uom_factor', 'secondary_uom_rate',
+ methods=['on_change_with_amount'])
+ def on_change_secondary_unit_price(self, name=None):
+ pool = Pool()
+ Uom = pool.get('product.uom')
+ if (self.secondary_unit_price is not None
+ and self.secondary_unit and self.unit
+ and (self.secondary_uom_factor or self.secondary_uom_rate)):
+ self.unit_price = Uom.compute_price(
+ self.secondary_unit, self.secondary_unit_price, self.unit,
+ factor=self.secondary_uom_rate, rate=self.secondary_uom_factor
+ ).quantize(Decimal(1) / 10 ** price_digits[1])
+ self.amount = self.on_change_with_amount()
+
+ @fields.depends(methods=[
+ 'on_change_secondary_quantity', 'on_change_secondary_unit_price'])
+ def on_change_secondary_unit(self):
+ self.on_change_secondary_quantity()
+ self.on_change_secondary_unit_price()
+
+ @fields.depends('secondary_unit')
+ def on_change_with_secondary_unit_digits(self, name=None):
+ if self.secondary_unit:
+ return self.secondary_unit.digits
+
+ @fields.depends(methods=['_secondary_record'])
+ def on_change_with_product_secondary_uom_category(self, name=None):
+ secondary_record = self._secondary_record()
+ if secondary_record:
+ return secondary_record.sale_secondary_uom.category.id
+
+ @classmethod
+ def set_secondary(cls, lines, name, value):
+ pass
+
+ @fields.depends('secondary_unit',
+ methods=['on_change_with_secondary_quantity', '_secondary_record'])
+ def on_change_product(self):
+ super().on_change_product()
+ secondary_record = self._secondary_record()
+ if secondary_record and self.secondary_unit:
+ secondary_uom = secondary_record.sale_secondary_uom
+ if secondary_uom:
+ if self.secondary_unit.category != secondary_uom.category:
+ self.secondary_unit = None
+
+ if secondary_record:
+ self.secondary_uom_factor = (
+ secondary_record.sale_secondary_uom_normal_factor)
+ self.secondary_uom_rate = (
+ secondary_record.sale_secondary_uom_normal_rate)
+ else:
+ self.secondary_unit = None
+ self.secondary_uom_factor = None
+ self.secondary_uom_rate = None
+ self.secondary_quantity = self.on_change_with_secondary_quantity()
+
+ def get_invoice_line(self):
+ pool = Pool()
+ InvoiceLine = pool.get('account.invoice.line')
+ lines = super().get_invoice_line()
+ if hasattr(InvoiceLine, 'secondary_unit'):
+ for line in lines:
+ if line.unit == self.unit:
+ line.secondary_unit = self.secondary_unit
+ return lines
+
+ def get_move(self, shipment_type):
+ move = super().get_move(shipment_type)
+ if move and hasattr(move.__class__, 'secondary_unit'):
+ if move.uom == self.unit:
+ move.secondary_unit = self.secondary_unit
+ return move
+
+
+class Line_ProductCustomer(metaclass=PoolMeta):
+ __name__ = 'sale.line'
+
+ @fields.depends('product_customer')
+ def _secondary_record(self):
+ if self.product_customer and self.product_customer.sale_secondary_uom:
+ return self.product_customer
+ return super()._secondary_record()
+
+
+class OpportunityLine(metaclass=PoolMeta):
+ __name__ = 'sale.opportunity.line'
+
+ def _set_sale_line_quantity(self, sale_line):
+ super()._set_sale_line_quantity(sale_line)
+ if self.unit.category != self.product.sale_uom.category:
+ sale_line.unit = self.product.sale_uom
+ sale_line.secondary_quantity = self.quantity
+ sale_line.secondary_unit = self.unit
+ sale_line.on_change_secondary_quantity()
diff -r 000000000000 -r 92098bd1ad6a sale.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sale.xml Sun Jul 28 14:34:20 2019 +0200
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<tryton>
+ <data>
+ <record model="ir.ui.view" id="sale_line_view_form">
+ <field name="model">sale.line</field>
+ <field name="inherit" ref="sale.sale_line_view_form"/>
+ <field name="name">sale_line_form</field>
+ </record>
+
+ <record model="ir.ui.view" id="sale_line_view_tree">
+ <field name="model">sale.line</field>
+ <field name="inherit" ref="sale.sale_line_view_tree"/>
+ <field name="name">sale_line_tree</field>
+ </record>
+
+ <record model="ir.ui.view" id="sale_line_view_tree_sequence">
+ <field name="model">sale.line</field>
+ <field name="inherit" ref="sale.sale_line_view_tree_sequence"/>
+ <field name="name">sale_line_tree</field>
+ </record>
+ </data>
+</tryton>
diff -r 000000000000 -r 92098bd1ad6a setup.py
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/setup.py Sun Jul 28 14:34:20 2019 +0200
@@ -0,0 +1,132 @@
+#!/usr/bin/env python3
+# This file is part of Tryton. The COPYRIGHT file at the top level of
+# this repository contains the full copyright notices and license terms.
+
+import io
+import os
+import re
+from configparser import ConfigParser
+from setuptools import setup, find_packages
+
+
+def read(fname):
+ return io.open(
+ os.path.join(os.path.dirname(__file__), fname),
+ 'r', encoding='utf-8').read()
+
+
+def get_require_version(name):
+ if minor_version % 2:
+ require = '%s >= %s.%s.dev0, < %s.%s'
+ else:
+ require = '%s >= %s.%s, < %s.%s'
+ require %= (name, major_version, minor_version,
+ major_version, minor_version + 1)
+ return require
+
+
+config = ConfigParser()
+config.read_file(open(os.path.join(os.path.dirname(__file__), 'tryton.cfg')))
+info = dict(config.items('tryton'))
+for key in ('depends', 'extras_depend', 'xml'):
+ if key in info:
+ info[key] = info[key].strip().splitlines()
+version = info.get('version', '0.0.1')
+major_version, minor_version, _ = version.split('.', 2)
+major_version = int(major_version)
+minor_version = int(minor_version)
+name = 'trytond_sale_secondary_unit'
+
+download_url = 'http://downloads.tryton.org/%s.%s/' % (
+ major_version, minor_version)
+if minor_version % 2:
+ version = '%s.%s.dev0' % (major_version, minor_version)
+ download_url = (
+ 'hg+http://hg.tryton.org/modules/%s#egg=%s-%s' % (
+ name[8:], name, version))
+
+requires = []
+for dep in info.get('depends', []):
+ if not re.match(r'(ir|res)(\W|$)', dep):
+ requires.append(get_require_version('trytond_%s' % dep))
+requires.append(get_require_version('trytond'))
+
+tests_require = [get_require_version('proteus'),
+ get_require_version('trytond_account_invoice_secondary_unit'),
+ get_require_version('trytond_stock_secondary_unit'),
+ get_require_version('trytond_sale_product_customer')]
+dependency_links = []
+if minor_version % 2:
+ dependency_links.append('https://trydevpi.tryton.org/')
+
+setup(name=name,
+ version=version,
+ description='Tryton module to add a secondary unit on sale line',
+ long_description=read('README.rst'),
+ author='Tryton',
+ author_email='b...@tryton.org',
+ url='http://www.tryton.org/',
+ download_url=download_url,
+ project_urls={
+ "Bug Tracker": 'https://bugs.tryton.org/',
+ "Documentation": 'https://docs.tryton.org/',
+ "Forum": 'https://www.tryton.org/forum',
+ "Source Code": 'https://hg.tryton.org/modules/sale_secondary_unit',
+ },
+ keywords='tryton sale secondary unit',
+ package_dir={'trytond.modules.sale_secondary_unit': '.'},
+ packages=(
+ ['trytond.modules.sale_secondary_unit'] +
+ ['trytond.modules.sale_secondary_unit.%s' % p for p in find_packages()]
+ ),
+ package_data={
+ 'trytond.modules.sale_secondary_unit': (info.get('xml', [])
+ + ['tryton.cfg', 'view/*.xml', 'locale/*.po', '*.fodt',
+ 'icons/*.svg', 'tests/*.rst']),
+ },
+ classifiers=[
+ 'Development Status :: 5 - Production/Stable',
+ 'Environment :: Plugins',
+ 'Framework :: Tryton',
+ 'Intended Audience :: Developers',
+ 'Intended Audience :: Financial and Insurance Industry',
+ 'Intended Audience :: Legal Industry',
+ 'License :: OSI Approved :: GNU General Public License v3 or later
(GPLv3+)',
+ 'Natural Language :: Bulgarian',
+ 'Natural Language :: Catalan',
+ 'Natural Language :: Chinese (Simplified)',
+ 'Natural Language :: Czech',
+ 'Natural Language :: Dutch',
+ 'Natural Language :: English',
+ 'Natural Language :: French',
+ 'Natural Language :: German',
+ 'Natural Language :: Hungarian',
+ 'Natural Language :: Italian',
+ 'Natural Language :: Persian',
+ 'Natural Language :: Polish',
+ 'Natural Language :: Portuguese (Brazilian)',
+ 'Natural Language :: Russian',
+ 'Natural Language :: Slovenian',
+ 'Natural Language :: Spanish',
+ 'Operating System :: OS Independent',
+ 'Programming Language :: Python :: 3',
+ 'Programming Language :: Python :: 3.5',
+ 'Programming Language :: Python :: 3.6',
+ 'Programming Language :: Python :: 3.7',
+ 'Programming Language :: Python :: Implementation :: CPython',
+ 'Programming Language :: Python :: Implementation :: PyPy',
+ 'Topic :: Office/Business',
+ ],
+ license='GPL-3',
+ python_requires='>=3.5',
+ install_requires=requires,
+ dependency_links=dependency_links,
+ zip_safe=False,
+ entry_points="""
+ [trytond.modules]
+ sale_secondary_unit = trytond.modules.sale_secondary_unit
+ """,
+ test_suite='tests',
+ test_loader='trytond.test_loader:Loader',
+ tests_require=tests_require,
+ )
diff -r 000000000000 -r 92098bd1ad6a stock.py
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/stock.py Sun Jul 28 14:34:20 2019 +0200
@@ -0,0 +1,35 @@
+# This file is part of Tryton. The COPYRIGHT file at the top level of
+# this repository contains the full copyright notices and license terms.
+
+from trytond.pool import PoolMeta, Pool
+
+
+class Move(metaclass=PoolMeta):
+ __name__ = 'stock.move'
+
+ def get_product_secondary_uom_category(self, name):
+ pool = Pool()
+ SaleLine = pool.get('sale.line')
+ category = super().get_product_secondary_uom_category(name)
+ if isinstance(self.origin, SaleLine):
+ if self.origin.secondary_unit:
+ category = self.origin.secondary_unit.category.id
+ return category
+
+ @property
+ def secondary_uom_factor(self):
+ pool = Pool()
+ SaleLine = pool.get('sale.line')
+ factor = super().secondary_uom_factor
+ if isinstance(self.origin, SaleLine):
+ factor = self.origin.secondary_uom_factor
+ return factor
+
+ @property
+ def secondary_uom_rate(self):
+ pool = Pool()
+ SaleLine = pool.get('sale.line')
+ factor = super().secondary_uom_rate
+ if isinstance(self.origin, SaleLine):
+ factor = self.origin.secondary_uom_rate
+ return factor
diff -r 000000000000 -r 92098bd1ad6a stock.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/stock.xml Sun Jul 28 14:34:20 2019 +0200
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<tryton>
+ <data depends="stock_secondary_unit">
+ <record model="ir.ui.view" id="move_view_list_shipment">
+ <field name="model">stock.move</field>
+ <field name="inherit" ref="sale.move_view_list_shipment"/>
+ <field name="name">stock_move_list</field>
+ </record>
+ </data>
+</tryton>
diff -r 000000000000 -r 92098bd1ad6a tests/__init__.py
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/__init__.py Sun Jul 28 14:34:20 2019 +0200
@@ -0,0 +1,9 @@
+# This file is part of Tryton. The COPYRIGHT file at the top level of
+# this repository contains the full copyright notices and license terms.
+
+try:
+ from trytond.modules.sale_secondary_unit.tests.test_sale_secondary_unit
import suite
+except ImportError:
+ from .test_sale_secondary_unit import suite
+
+__all__ = ['suite']
diff -r 000000000000 -r 92098bd1ad6a tests/scenario_sale_secondary_unit.rst
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/scenario_sale_secondary_unit.rst Sun Jul 28 14:34:20 2019 +0200
@@ -0,0 +1,132 @@
+============================
+Sale Secondary Unit Scenario
+============================
+
+Imports::
+
+ >>> from decimal import Decimal
+ >>> from proteus import Model, Wizard
+ >>> from trytond.tests.tools import activate_modules
+ >>> from trytond.modules.company.tests.tools import create_company, \
+ ... get_company
+ >>> from trytond.modules.account.tests.tools import create_chart, \
+ ... get_accounts
+
+Install sale_secondary_unit::
+
+ >>> config = activate_modules(
+ ... ['sale_secondary_unit',
+ ... 'account_invoice_secondary_unit',
+ ... 'stock_secondary_unit'])
+
+Create company::
+
+ >>> _ = create_company()
+ >>> company = get_company()
+
+Create chart of accounts::
+
+ >>> _ = create_chart(company)
+ >>> accounts = get_accounts(company)
+
+Create customer::
+
+ >>> Party = Model.get('party.party')
+ >>> customer = Party(name="Customer")
+ >>> customer.save()
+
+Create account categories::
+
+ >>> ProductCategory = Model.get('product.category')
+ >>> account_category = ProductCategory(name="Account Category")
+ >>> account_category.accounting = True
+ >>> account_category.account_expense = accounts['expense']
+ >>> account_category.account_revenue = accounts['revenue']
+ >>> account_category.save()
+
+Create product::
+
+ >>> ProductUom = Model.get('product.uom')
+ >>> unit, = ProductUom.find([('name', '=', "Unit")])
+ >>> gr, = ProductUom.find([('name', '=', "Gram")])
+ >>> kg, = ProductUom.find([('name', '=', "Kilogram")])
+ >>> ProductTemplate = Model.get('product.template')
+
+ >>> template = ProductTemplate()
+ >>> template.name = 'product'
+ >>> template.default_uom = unit
+ >>> template.type = 'goods'
+ >>> template.salable = True
+ >>> template.sale_secondary_uom = gr
+ >>> template.sale_secondary_uom_factor = 200
+ >>> template.sale_secondary_uom_rate
+ 0.005
+ >>> template.list_price = Decimal('10')
+ >>> template.account_category = account_category
+ >>> template.save()
+ >>> product, = template.products
+
+Sale product::
+
+ >>> Sale = Model.get('sale.sale')
+ >>> sale = Sale()
+ >>> sale.party = customer
+ >>> line = sale.lines.new()
+ >>> line.product = product
+ >>> line.quantity = 10
+
+Check secondary unit::
+
+ >>> line.secondary_unit = kg
+ >>> line.secondary_quantity
+ 2.0
+ >>> line.secondary_unit_price
+ Decimal('50.0000')
+ >>> line.secondary_unit_price = Decimal('40')
+ >>> line.unit_price
+ Decimal('8.0000')
+ >>> line.secondary_quantity = 1000
+ >>> line.quantity
+ 5000.0
+ >>> line.secondary_unit = gr
+ >>> line.quantity
+ 5.0
+
+Confirm sale::
+
+ >>> line.secondary_unit = kg
+ >>> line.quantity = 10
+ >>> sale.click('quote')
+ >>> sale.click('confirm')
+ >>> sale.invoice_state
+ 'waiting'
+ >>> sale.shipment_state
+ 'waiting'
+
+Check secondary unit on invoice::
+
+ >>> invoice, = sale.invoices
+ >>> line, = invoice.lines
+ >>> line.secondary_unit == kg
+ True
+ >>> line.secondary_quantity
+ 2.0
+ >>> line.secondary_unit_price
+ Decimal('50.0000')
+
+Check secondary unit on move::
+
+ >>> move, = sale.moves
+ >>> move.secondary_unit == kg
+ True
+ >>> move.secondary_quantity
+ 2.0
+ >>> move.secondary_unit_price
+ Decimal('50.0000')
+
+ >>> shipment, = sale.shipments
+ >>> move, = shipment.inventory_moves
+ >>> move.secondary_unit == kg
+ True
+ >>> move.secondary_quantity
+ 2.0
diff -r 000000000000 -r 92098bd1ad6a tests/test_sale_secondary_unit.py
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test_sale_secondary_unit.py Sun Jul 28 14:34:20 2019 +0200
@@ -0,0 +1,31 @@
+# This file is part of Tryton. The COPYRIGHT file at the top level of
+# this repository contains the full copyright notices and license terms.
+
+import unittest
+
+import doctest
+
+from trytond.tests.test_tryton import ModuleTestCase
+from trytond.tests.test_tryton import suite as test_suite
+from trytond.tests.test_tryton import doctest_teardown
+from trytond.tests.test_tryton import doctest_checker
+
+
+class SaleSecondaryUnitTestCase(ModuleTestCase):
+ 'Test Sale Secondary Unit module'
+ module = 'sale_secondary_unit'
+ extras = [
+ 'account_invoice_secondary_unit', 'stock_secondary_unit',
+ 'sale_product_customer']
+
+
+def suite():
+ suite = test_suite()
+ suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
+ SaleSecondaryUnitTestCase))
+ suite.addTests(doctest.DocFileSuite(
+ 'scenario_sale_secondary_unit.rst',
+ tearDown=doctest_teardown, encoding='utf-8',
+ checker=doctest_checker,
+ optionflags=doctest.REPORT_ONLY_FIRST_FAILURE))
+ return suite
diff -r 000000000000 -r 92098bd1ad6a tox.ini
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tox.ini Sun Jul 28 14:34:20 2019 +0200
@@ -0,0 +1,15 @@
+[tox]
+envlist = {py35,py36,py37}-{sqlite,postgresql},pypy3-{sqlite,postgresql}
+
+[testenv]
+commands = {envpython} setup.py test
+deps =
+ {py35,py36,py37}-postgresql: psycopg2 >= 2.5
+ pypy3-postgresql: psycopg2cffi >= 2.5
+ {py35,py36}-sqlite: sqlitebck
+setenv =
+ sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}
+ postgresql: TRYTOND_DATABASE_URI={env:POSTGRESQL_URI:postgresql://}
+ sqlite: DB_NAME={env:SQLITE_NAME::memory:}
+ postgresql: DB_NAME={env:POSTGRESQL_NAME:test}
+install_command = pip install --pre --find-links https://trydevpi.tryton.org/
{opts} {packages}
diff -r 000000000000 -r 92098bd1ad6a tryton.cfg
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tryton.cfg Sun Jul 28 14:34:20 2019 +0200
@@ -0,0 +1,18 @@
+[tryton]
+version=5.3.0
+depends:
+ account_invoice
+ ir
+ product
+ sale
+ stock
+extras_depend:
+ account_invoice_secondary_unit
+ sale_opportunity
+ sale_product_customer
+ stock_secondary_unit
+xml:
+ product.xml
+ sale.xml
+ stock.xml
+ message.xml
diff -r 000000000000 -r 92098bd1ad6a view/product_customer_form.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/view/product_customer_form.xml Sun Jul 28 14:34:20 2019 +0200
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<data>
+ <xpath expr="//field[@name='code']" position="after">
+ <label name="sale_secondary_uom"/>
+ <field name="sale_secondary_uom"/>
+ <group id="sale_secondary_uom" col="-1" colspan="2">
+ <label name="sale_secondary_uom_factor" string="Factor:"/>
+ <field name="sale_secondary_uom_factor"/>
+ <label name="sale_secondary_uom_rate" string="Rate:"/>
+ <field name="sale_secondary_uom_rate"/>
+ </group>
+ </xpath>
+</data>
diff -r 000000000000 -r 92098bd1ad6a view/product_template_form.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/view/product_template_form.xml Sun Jul 28 14:34:20 2019 +0200
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<data>
+ <xpath expr="//page[@id='customers']//field[@name='sale_uom']"
position="after">
+ <newline/>
+ <label name="sale_secondary_uom"/>
+ <field name="sale_secondary_uom"/>
+ <group id="sale_secondary_uom" col="-1" colspan="2">
+ <label name="sale_secondary_uom_factor" string="Factor:"/>
+ <field name="sale_secondary_uom_factor"/>
+ <label name="sale_secondary_uom_rate" string="Rate:"/>
+ <field name="sale_secondary_uom_rate"/>
+ </group>
+ </xpath>
+</data>
diff -r 000000000000 -r 92098bd1ad6a view/sale_line_form.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/view/sale_line_form.xml Sun Jul 28 14:34:20 2019 +0200
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<data>
+ <xpath expr="//field[@name='amount']" position="after">
+ <separator name="secondary_unit" colspan="4"/>
+ <label name="secondary_quantity" string="Quantity:"/>
+ <field name="secondary_quantity"/>
+ <label name="secondary_unit" string="Unit:"/>
+ <field name="secondary_unit"/>
+ <label name="secondary_unit_price" string="Unit Price:"/>
+ <field name="secondary_unit_price"/>
+ <newline/>
+ </xpath>
+</data>
diff -r 000000000000 -r 92098bd1ad6a view/sale_line_tree.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/view/sale_line_tree.xml Sun Jul 28 14:34:20 2019 +0200
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<data>
+ <xpath expr="//field[@name='unit_price']" position="after">
+ <field name="secondary_quantity"/>
+ <field name="secondary_unit"/>
+ <field name="secondary_unit_price"/>
+ </xpath>
+</data>
diff -r 000000000000 -r 92098bd1ad6a view/stock_move_list.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/view/stock_move_list.xml Sun Jul 28 14:34:20 2019 +0200
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<data>
+ <xpath expr="//field[@name='uom']" position="after">
+ <field name="secondary_quantity"/>
+ <field name="secondary_unit"/>
+ </xpath>
+</data>
