changeset 1fd7712198f9 in modules/carrier_carriage:default
details:
https://hg.tryton.org/modules/carrier_carriage?cmd=changeset&node=1fd7712198f9
description:
Add carrier_carriage module
issue11623
review443451003
diffstat:
.drone.yml | 78 ++++
.flake8 | 2 +
.isort.cfg | 3 +
COPYRIGHT | 15 +
LICENSE | 674 +++++++++++++++++++++++++++++++++++
MANIFEST.in | 5 +
README.rst | 1 +
__init__.py | 33 +
account.py | 13 +
doc/conf.py | 61 +++
doc/design.rst | 68 +++
doc/index.rst | 11 +
incoterm.py | 20 +
incoterm.xml | 129 ++++++
message.xml | 10 +
sale.py | 224 +++++++++++
sale.xml | 24 +
setup.py | 161 ++++++++
stock.py | 222 +++++++++++
stock.xml | 66 +++
tests/__init__.py | 2 +
tests/scenario_carrier_carriage.rst | 167 ++++++++
tests/test_module.py | 12 +
tests/test_scenario.py | 8 +
tox.ini | 17 +
tryton.cfg | 18 +
view/incoterm_form.xml | 11 +
view/incoterm_list.xml | 11 +
view/sale_carriage_form.xml | 23 +
view/sale_carriage_list.xml | 11 +
view/sale_form.xml | 15 +
view/shipment_carriage_form.xml | 26 +
view/shipment_carriage_form_sale.xml | 12 +
view/shipment_carriage_list.xml | 11 +
view/shipment_carriage_list_sale.xml | 8 +
view/shipment_form.xml | 10 +
36 files changed, 2182 insertions(+), 0 deletions(-)
diffs (2327 lines):
diff -r 000000000000 -r 1fd7712198f9 .drone.yml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/.drone.yml Sat Sep 10 17:35:38 2022 +0200
@@ -0,0 +1,78 @@
+clone:
+ hg:
+ image: plugins/hg
+ environment:
+ - HG_SHARE_POOL=/root/.cache/hg
+ volumes:
+ - cache:/root/.cache
+
+pipeline:
+ tox:
+ image: ${IMAGE}
+ environment:
+ - CFLAGS=-O0
+ - DB_CACHE=/cache
+ - TOX_TESTENV_PASSENV=CFLAGS DB_CACHE CI_BUILD_NUMBER
CI_JOB_NUMBER CI_JOB_ID
+ - POSTGRESQL_URI=postgresql://postgres@postgresql:5432/
+ commands:
+ - echo "[extensions]" >> /root/.hgrc
+ - echo "hgext.share =" >> /root/.hgrc
+ - echo "[share]" >> /root/.hgrc
+ - echo "pool = /root/.cache/hg" >> /root/.hgrc
+ - pip install tox
+ - tox -e "${TOXENV}-${DATABASE}"
+ volumes:
+ - cache:/root/.cache
+ check_dist:
+ image: ${IMAGE}
+ commands:
+ - pip install twine
+ - python setup.py sdist
+ - twine check dist/*
+ volumes:
+ - cache:/root/.cache
+ check_doc:
+ image: ${IMAGE}
+ commands:
+ - pip install sphinx
+ - python -m sphinx -T -E -W -n -b html doc _build/html
+ - python -m sphinx -T -E -W -n -b linkcheck doc _build
+ volumes:
+ - cache:/root/.cache
+
+services:
+ postgresql:
+ image: postgres
+ environment:
+ - POSTGRES_HOST_AUTH_METHOD=trust
+ command: "-c fsync=off -c synchronous_commit=off -c
full_page_writes=off"
+ when:
+ matrix:
+ DATABASE: postgresql
+
+matrix:
+ include:
+ - IMAGE: python:3.7
+ TOXENV: py37
+ DATABASE: sqlite
+ - IMAGE: python:3.7
+ TOXENV: py37
+ DATABASE: postgresql
+ - IMAGE: python:3.8
+ TOXENV: py38
+ DATABASE: sqlite
+ - IMAGE: python:3.8
+ TOXENV: py38
+ DATABASE: postgresql
+ - IMAGE: python:3.9
+ TOXENV: py39
+ DATABASE: sqlite
+ - IMAGE: python:3.9
+ TOXENV: py39
+ DATABASE: postgresql
+ - IMAGE: python:3.10
+ TOXENV: py310
+ DATABASE: sqlite
+ - IMAGE: python:3.10
+ TOXENV: py310
+ DATABASE: postgresql
diff -r 000000000000 -r 1fd7712198f9 .flake8
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/.flake8 Sat Sep 10 17:35:38 2022 +0200
@@ -0,0 +1,2 @@
+[flake8]
+ignore=E123,E124,E126,E128,E741,W503
diff -r 000000000000 -r 1fd7712198f9 .isort.cfg
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/.isort.cfg Sat Sep 10 17:35:38 2022 +0200
@@ -0,0 +1,3 @@
+[settings]
+multi_line_output=4
+known_first_party=trytond
diff -r 000000000000 -r 1fd7712198f9 COPYRIGHT
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/COPYRIGHT Sat Sep 10 17:35:38 2022 +0200
@@ -0,0 +1,15 @@
+Copyright (C) 2022 B2CK
+Copyright (C) 2022 Cédric Krier
+
+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 1fd7712198f9 LICENSE
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/LICENSE Sat Sep 10 17:35:38 2022 +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 1fd7712198f9 MANIFEST.in
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/MANIFEST.in Sat Sep 10 17:35:38 2022 +0200
@@ -0,0 +1,5 @@
+include CHANGELOG
+include COPYRIGHT
+include LICENSE
+include README.rst
+graft doc
diff -r 000000000000 -r 1fd7712198f9 README.rst
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/README.rst Sat Sep 10 17:35:38 2022 +0200
@@ -0,0 +1,1 @@
+doc/index.rst
\ No newline at end of file
diff -r 000000000000 -r 1fd7712198f9 __init__.py
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/__init__.py Sat Sep 10 17:35:38 2022 +0200
@@ -0,0 +1,33 @@
+# 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, incoterm, sale, stock
+
+__all__ = ['register']
+
+
+def register():
+ Pool.register(
+ stock.Carriage,
+ stock.ShipmentOut,
+ stock.ShipmentOutReturn,
+ module='carrier_carriage', type_='model')
+ Pool.register(
+ sale.Sale,
+ sale.Line,
+ sale.Carriage,
+ stock.Carriage_Sale,
+ account.InvoiceLine,
+ module='carrier_carriage', type_='model',
+ depends=['sale_shipment_cost'])
+ Pool.register(
+ stock.Carriage_Purchase,
+ stock.ShipmentIn,
+ module='carrier_carriage', type_='model',
+ depends=['purchase_shipment_cost'])
+ Pool.register(
+ incoterm.Incoterm,
+ module='carrier_carriage', type_='model',
+ depends=['incoterm'])
diff -r 000000000000 -r 1fd7712198f9 account.py
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/account.py Sat Sep 10 17:35:38 2022 +0200
@@ -0,0 +1,13 @@
+# 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.model import fields
+from trytond.pool import PoolMeta
+
+
+class InvoiceLine(metaclass=PoolMeta):
+ __name__ = 'account.invoice.line'
+
+ cost_shipment_carriages = fields.One2Many(
+ 'stock.shipment.carriage', 'cost_invoice_line',
+ "Cost of Shipment Carriages", readonly=True)
diff -r 000000000000 -r 1fd7712198f9 doc/conf.py
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/doc/conf.py Sat Sep 10 17:35:38 2022 +0200
@@ -0,0 +1,61 @@
+# This file is part of Tryton. The COPYRIGHT file at the top level of
+# this repository contains the full copyright notices and license terms.
+
+modules_url = 'https://docs.tryton.org/projects/modules-{module}/en/{series}/'
+trytond_url = 'https://docs.tryton.org/projects/server/en/{series}/'
+
+
+def get_info():
+ import configparser
+ import os
+ import subprocess
+ import sys
+
+ module_dir = os.path.dirname(os.path.dirname(__file__))
+
+ config = configparser.ConfigParser()
+ config.read_file(open(os.path.join(module_dir, 'tryton.cfg')))
+ info = dict(config.items('tryton'))
+
+ result = subprocess.run(
+ [sys.executable, 'setup.py', '--name'],
+ stdout=subprocess.PIPE, check=True, cwd=module_dir)
+ info['name'] = result.stdout.decode('utf-8').strip()
+
+ result = subprocess.run(
+ [sys.executable, 'setup.py', '--version'],
+ stdout=subprocess.PIPE, check=True, cwd=module_dir)
+ version = result.stdout.decode('utf-8').strip()
+ if 'dev' in version:
+ info['series'] = 'latest'
+ else:
+ info['series'] = '.'.join(version.split('.', 2)[:2])
+
+ for key in {'depends', 'extras_depend'}:
+ info[key] = info.get(key, '').strip().splitlines()
+ info['modules'] = set(info['depends'] + info['extras_depend'])
+ info['modules'] -= {'ir', 'res'}
+
+ return info
+
+
+info = get_info()
+
+master_doc = 'index'
+project = info['name']
+release = version = info['series']
+default_role = 'ref'
+highlight_language = 'none'
+extensions = [
+ 'sphinx.ext.intersphinx',
+ ]
+intersphinx_mapping = {
+ 'trytond': (trytond_url.format(series=version), None),
+ }
+intersphinx_mapping.update({
+ m: (modules_url.format(
+ module=m.replace('_', '-'), series=version), None)
+ for m in info['modules']
+ })
+
+del get_info, info, modules_url, trytond_url
diff -r 000000000000 -r 1fd7712198f9 doc/design.rst
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/doc/design.rst Sat Sep 10 17:35:38 2022 +0200
@@ -0,0 +1,68 @@
+******
+Design
+******
+
+The *Carrier Carriage Module* introduces or extends the following concepts.
+
+.. _model-stock.shipment.carriage:
+
+Shipment Carriage
+=================
+
+The *Shipment Carriage* stores the information about carriers used before or
+after the main carrier for a `Shipment <stock:concept-stock.shipment>`.
+
+.. _concept-stock.shipment:
+
+Shipment
+========
+
+The `Supplier <stock:model-stock.shipment.in>`, `Customer
+<stock:model-stock.shipment.out>` and `Customer Return
+<stock:model-stock.shipment.out.return>` Shipment are extended to store the
+`carriers <model-stock.shipment.carriage>` used before and after the main
+carrier.
+
+.. seealso::
+
+ The `Shipment <stock:concept-stock.shipment>` concept is introduced by the
+ :doc:`Stock Module <stock:index>`.
+
+.. _model-sale.carriage:
+
+Sale Carriage
+=============
+
+The *Sale Carriage* stores the information of the available carriers to use
+before or after the main carrier for a `Sale <sale:model-sale.sale>`.
+
+.. _model-sale.sale:
+
+Sale
+====
+
+When the :doc:`Sale Shipment Cost Module <sale_shipment_cost:index>` is
+activated, the *Sale* concept is extended to store the `carriers
+<model-sale.carriage>` used before and after the main carrier.
+The carriages are copied to the `Customer Shipment
+<stock:model-stock.shipment.out>`.
+At the quotation, a shipment cost *Sale Line* is added per carriages with a
+*Cost Method*.
+
+.. seealso::
+
+ The `Sale <sale:model-sale.sale>` concept is introduced by the :doc:`Sale
+ Module <sale:index>`.
+
+.. _model-incoterm.incoterm:
+
+Incoterm
+========
+
+The *Incoterm* concept is extended to add criteria for before and after
+carrier.
+
+.. seealso::
+
+ The `Incoterm <incoterm:model-incoterm.incoterm>` concept is introduced by
+ the :doc:`Incoterm Module <incoterm:index>`.
diff -r 000000000000 -r 1fd7712198f9 doc/index.rst
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/doc/index.rst Sat Sep 10 17:35:38 2022 +0200
@@ -0,0 +1,11 @@
+#######################
+Carrier Carriage Module
+#######################
+
+The *Carrier Carriage Module* extends the support of carrier by adding carriers
+before and after the main carrier.
+
+.. toctree::
+ :maxdepth: 2
+
+ design
diff -r 000000000000 -r 1fd7712198f9 incoterm.py
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/incoterm.py Sat Sep 10 17:35:38 2022 +0200
@@ -0,0 +1,20 @@
+# 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
+from trytond.model import fields
+
+
+class Incoterm(metaclass=PoolMeta):
+ __name__ = 'incoterm.incoterm'
+
+ before_carrier = fields.Selection([
+ ('buyer', "Buyer"),
+ ('seller', "Seller"),
+ ], "Before Carrier", required=True,
+ help="Who contracts carriages before main carriage.")
+ after_carrier = fields.Selection([
+ ('buyer', "Buyer"),
+ ('seller', "Seller"),
+ ], "After Carrier", required=True,
+ help="Who contracts carriages after main carriage.")
diff -r 000000000000 -r 1fd7712198f9 incoterm.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/incoterm.xml Sat Sep 10 17:35:38 2022 +0200
@@ -0,0 +1,129 @@
+<?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="incoterm">
+ <record model="ir.ui.view" id="incoterm_view_form">
+ <field name="model">incoterm.incoterm</field>
+ <field name="inherit" ref="incoterm.incoterm_view_form"/>
+ <field name="name">incoterm_form</field>
+ </record>
+
+ <record model="ir.ui.view" id="incoterm_view_list">
+ <field name="model">incoterm.incoterm</field>
+ <field name="inherit" ref="incoterm.incoterm_view_list"/>
+ <field name="name">incoterm_list</field>
+ </record>
+ </data>
+ <data depends="incoterm" grouped="1">
+ <record model="incoterm.incoterm" id="incoterm.incoterm_exw_2010">
+ <field name="before_carrier">buyer</field>
+ <field name="after_carrier">buyer</field>
+ </record>
+
+ <record model="incoterm.incoterm" id="incoterm.incoterm_fca_2010">
+ <field name="before_carrier">seller</field>
+ <field name="after_carrier">buyer</field>
+ </record>
+
+ <record model="incoterm.incoterm" id="incoterm.incoterm_cpt_2010">
+ <field name="before_carrier">seller</field>
+ <field name="after_carrier">seller</field>
+ </record>
+
+ <record model="incoterm.incoterm" id="incoterm.incoterm_cip_2010">
+ <field name="before_carrier">seller</field>
+ <field name="after_carrier">seller</field>
+ </record>
+
+ <record model="incoterm.incoterm" id="incoterm.incoterm_dat_2010">
+ <field name="before_carrier">seller</field>
+ <field name="after_carrier">seller</field>
+ </record>
+
+ <record model="incoterm.incoterm" id="incoterm.incoterm_dap_2010">
+ <field name="before_carrier">seller</field>
+ <field name="after_carrier">buyer</field>
+ </record>
+
+ <record model="incoterm.incoterm" id="incoterm.incoterm_ddp_2010">
+ <field name="before_carrier">seller</field>
+ <field name="after_carrier">buyer</field>
+ </record>
+
+ <record model="incoterm.incoterm" id="incoterm.incoterm_fas_2010">
+ <field name="before_carrier">seller</field>
+ <field name="after_carrier">buyer</field>
+ </record>
+
+ <record model="incoterm.incoterm" id="incoterm.incoterm_fob_2010">
+ <field name="before_carrier">seller</field>
+ <field name="after_carrier">buyer</field>
+ </record>
+
+ <record model="incoterm.incoterm" id="incoterm.incoterm_cfr_2010">
+ <field name="before_carrier">seller</field>
+ <field name="after_carrier">buyer</field>
+ </record>
+
+ <record model="incoterm.incoterm" id="incoterm.incoterm_cif_2010">
+ <field name="before_carrier">seller</field>
+ <field name="after_carrier">buyer</field>
+ </record>
+
+ <record model="incoterm.incoterm" id="incoterm.incoterm_exw_2020">
+ <field name="before_carrier">buyer</field>
+ <field name="after_carrier">buyer</field>
+ </record>
+
+ <record model="incoterm.incoterm" id="incoterm.incoterm_fca_2020">
+ <field name="before_carrier">seller</field>
+ <field name="after_carrier">buyer</field>
+ </record>
+
+ <record model="incoterm.incoterm" id="incoterm.incoterm_cpt_2020">
+ <field name="before_carrier">seller</field>
+ <field name="after_carrier">seller</field>
+ </record>
+
+ <record model="incoterm.incoterm" id="incoterm.incoterm_cip_2020">
+ <field name="before_carrier">seller</field>
+ <field name="after_carrier">seller</field>
+ </record>
+
+ <record model="incoterm.incoterm" id="incoterm.incoterm_dpu_2020">
+ <field name="before_carrier">seller</field>
+ <field name="after_carrier">seller</field>
+ </record>
+
+ <record model="incoterm.incoterm" id="incoterm.incoterm_dap_2020">
+ <field name="before_carrier">seller</field>
+ <field name="after_carrier">buyer</field>
+ </record>
+
+ <record model="incoterm.incoterm" id="incoterm.incoterm_ddp_2020">
+ <field name="before_carrier">seller</field>
+ <field name="after_carrier">buyer</field>
+ </record>
+
+ <record model="incoterm.incoterm" id="incoterm.incoterm_fas_2020">
+ <field name="before_carrier">seller</field>
+ <field name="after_carrier">buyer</field>
+ </record>
+
+ <record model="incoterm.incoterm" id="incoterm.incoterm_fob_2020">
+ <field name="before_carrier">seller</field>
+ <field name="after_carrier">buyer</field>
+ </record>
+
+ <record model="incoterm.incoterm" id="incoterm.incoterm_cfr_2020">
+ <field name="before_carrier">seller</field>
+ <field name="after_carrier">buyer</field>
+ </record>
+
+ <record model="incoterm.incoterm" id="incoterm.incoterm_cif_2020">
+ <field name="before_carrier">seller</field>
+ <field name="after_carrier">buyer</field>
+ </record>
+ </data>
+</tryton>
diff -r 000000000000 -r 1fd7712198f9 message.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/message.xml Sat Sep 10 17:35:38 2022 +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 grouped="1">
+ <record model="ir.message" id="msg_shipment_carriage_delete">
+ <field name="text">You cannot delete the carriage
"%(carriage)".</field>
+ </record>
+ </data>
+</tryton>
diff -r 000000000000 -r 1fd7712198f9 sale.py
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sale.py Sat Sep 10 17:35:38 2022 +0200
@@ -0,0 +1,224 @@
+# 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 ModelSQL, ModelView, fields, sequence_ordered
+from trytond.pool import Pool, PoolMeta
+from trytond.pyson import Eval, If
+from trytond.transaction import Transaction
+
+
+class Sale(metaclass=PoolMeta):
+ __name__ = 'sale.sale'
+
+ _states = {
+ 'readonly': Eval('state') != 'draft',
+ }
+
+ carriages = fields.One2Many(
+ 'sale.carriage', 'sale', "Carriages", readonly=True)
+ before_carriages = fields.One2Many(
+ 'sale.carriage', 'sale', "Before Carriages",
+ filter=[
+ ('type', '=', 'before'),
+ ],
+ states=_states,
+ help="Carriages before the main carrier.")
+ after_carriages = fields.One2Many(
+ 'sale.carriage', 'sale', "After Carriages",
+ filter=[
+ ('type', '=', 'after'),
+ ],
+ states=_states,
+ help="Carriages after the main carrier.")
+
+ del _states
+
+ def set_shipment_cost(self):
+ removed = super().set_shipment_cost()
+ lines = list(self.lines or [])
+ for carriage in self.carriages:
+ if carriage.cost_method:
+ cost = self.compute_shipment_cost(carriage.carrier)
+ if cost is not None:
+ unit_price = None
+ for line in removed:
+ if line.shipment_cost == cost:
+ unit_price = (
+ line.unit_price * Decimal(str(line.quantity)))
+ lines.append(self.get_shipment_cost_line(
+ carriage.carrier, cost, unit_price=unit_price))
+ self.lines = lines
+ return removed
+
+ def _get_shipment_sale(self, Shipment, key):
+ pool = Pool()
+ ShipmentCarriage = pool.get('stock.shipment.carriage')
+ ShipmentOut = pool.get('stock.shipment.out')
+ shipment = super()._get_shipment_sale(Shipment, key)
+ if isinstance(shipment, ShipmentOut):
+ shipment.carriages = [
+ ShipmentCarriage.from_sale(carriage)
+ for carriage in self.carriages]
+ return shipment
+
+ @fields.depends('before_carriages', 'after_carriages')
+ def _get_incoterm_pattern(self):
+ pattern = super()._get_incoterm_pattern()
+
+ def cost_methods(carriages):
+ for carriage in carriages:
+ yield getattr(carriage, 'cost_method', None)
+
+ def negate(iterable):
+ for i in iterable:
+ yield not i
+
+ if self.before_carriages:
+ if any(cost_methods(self.before_carriages)):
+ pattern['before_carrier'] = 'seller'
+ elif all(negate(cost_methods(self.before_carriages))):
+ pattern['before_carrier'] = 'buyer'
+
+ if self.after_carriages:
+ if any(cost_methods(self.after_carriages)):
+ pattern['after_carrier'] = 'seller'
+ elif all(negate(cost_methods(self.after_carriages))):
+ pattern['after_carrier'] = 'buyer'
+ return pattern
+
+
+class Line(metaclass=PoolMeta):
+ __name__ = 'sale.line'
+
+ def get_invoice_line(self):
+ context = Transaction().context
+ shipment_cost_invoiced = context.get('_shipment_cost_invoiced')
+ if shipment_cost_invoiced is not None:
+ # Make a copy to still detect new shipment after super call
+ shipment_cost_invoiced = list(shipment_cost_invoiced)
+ lines = super().get_invoice_line()
+ if (self.shipment_cost
+ and shipment_cost_invoiced is not None):
+ for shipment in self.sale.shipments:
+ if (shipment.state == 'done'
+ and shipment.id not in shipment_cost_invoiced):
+ invoice = self.sale._get_invoice_sale()
+ for carriage in shipment.carriages:
+ invoice_line = carriage.get_cost_invoice_line(invoice)
+ if invoice_line:
+ # XXX: self is not necessary linked to carriage
+ invoice_line.origin = self
+ lines.append(invoice_line)
+ return lines
+
+
+class Carriage(sequence_ordered(), ModelSQL, ModelView):
+ "Sale Carriage"
+ __name__ = 'sale.carriage'
+
+ _states = {
+ 'readonly': Eval('sale_state') != 'draft',
+ }
+
+ sale = fields.Many2One(
+ 'sale.sale', "Sale",
+ required=True, select=True, ondelete='CASCADE', states=_states)
+ type = fields.Selection([
+ ('before', "Before"),
+ ('after', "After"),
+ ], "Type", sort=False, required=True, states=_states)
+ carrier = fields.Many2One(
+ 'carrier', "Carrier", required=True,
+ domain=[
+ If(Eval('sale_state') == 'draft', [
+ ('carrier_product.salable', '=', True),
+ ('id', 'in', Eval('available_carriers', [])),
+ ],
+ []),
+ ],
+ states=_states)
+ cost_method = fields.Selection(
+ 'get_cost_methods', "Cost Method", states=_states)
+ from_ = fields.Many2One('party.address', "From", states=_states)
+ to = fields.Many2One('party.address', "To", states=_states)
+
+ sale_state = fields.Function(
+ fields.Selection('get_sale_states', "Sale State"),
+ 'on_change_with_sale_state')
+ available_carriers = fields.Function(
+ fields.Many2Many('carrier', None, None, "Available Carriers"),
+ 'on_change_with_available_carriers')
+
+ del _states
+
+ @classmethod
+ def __setup__(cls):
+ super().__setup__()
+ cls.__access__.add('sale')
+ cls._order.insert(0, ('type', 'ASC'))
+
+ @classmethod
+ def get_cost_methods(cls):
+ pool = Pool()
+ Sale = pool.get('sale.sale')
+ fieldname = 'shipment_cost_method'
+ return Sale.fields_get([fieldname])[fieldname]['selection']
+
+ @classmethod
+ def get_sale_states(cls):
+ pool = Pool()
+ Sale = pool.get('sale.sale')
+ return Sale.fields_get(['state'])['state']['selection']
+
+ @fields.depends('sale', '_parent_sale.state')
+ def on_change_with_sale_state(self, name=None):
+ if self.sale:
+ return self.sale.state
+
+ @classmethod
+ def default_available_carriers(cls):
+ pool = Pool()
+ CarrierSelection = pool.get('carrier.selection')
+ carriers = CarrierSelection.get_carriers({})
+ return [c.id for c in carriers]
+
+ @fields.depends(methods=['_get_carrier_selection_pattern'])
+ def on_change_with_available_carriers(self, name=None):
+ pool = Pool()
+ CarrierSelection = pool.get('carrier.selection')
+
+ pattern = self._get_carrier_selection_pattern()
+ carriers = CarrierSelection.get_carriers(pattern)
+ return [c.id for c in carriers]
+
+ @fields.depends('from_', 'to')
+ def _get_carrier_selection_pattern(self):
+ pattern = {}
+ if self.from_ and self.from_.country:
+ pattern['from_country'] = self.from_.country.id
+ else:
+ pattern['from_country'] = None
+ if self.to and self.to.country:
+ pattern['to_country'] = self.to.country.id
+ else:
+ pattern['to_country'] = None
+ return pattern
+
+ @fields.depends(methods=['_on_change_pattern'])
+ def on_change_from_(self):
+ self._on_change_pattern()
+
+ @fields.depends(methods=['_on_change_pattern'])
+ def on_change_to(self):
+ self._on_change_pattern()
+
+ @fields.depends('carrier', methods=['on_change_with_available_carriers'])
+ def _on_change_pattern(self):
+ self.available_carriers = self.on_change_with_available_carriers()
+ if self.carrier and self.carrier not in self.available_carriers:
+ self.carrier = None
+
+ def get_rec_name(self, name):
+ return f'{self.carrier.rec_name} @ {self.sale.rec_name}'
diff -r 000000000000 -r 1fd7712198f9 sale.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sale.xml Sat Sep 10 17:35:38 2022 +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 depends="sale_shipment_cost">
+ <record model="ir.ui.view" id="sale_view_form">
+ <field name="model">sale.sale</field>
+ <field name="inherit" ref="sale.sale_view_form"/>
+ <field name="name">sale_form</field>
+ </record>
+
+ <record model="ir.ui.view" id="sale_carriage_view_form">
+ <field name="model">sale.carriage</field>
+ <field name="type">form</field>
+ <field name="name">sale_carriage_form</field>
+ </record>
+
+ <record model="ir.ui.view" id="sale_carriage_view_list">
+ <field name="model">sale.carriage</field>
+ <field name="type">tree</field>
+ <field name="name">sale_carriage_list</field>
+ </record>
+ </data>
+</tryton>
diff -r 000000000000 -r 1fd7712198f9 setup.py
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/setup.py Sat Sep 10 17:35:38 2022 +0200
@@ -0,0 +1,161 @@
+#!/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 find_packages, setup
+
+
+def read(fname):
+ content = io.open(
+ os.path.join(os.path.dirname(__file__), fname),
+ 'r', encoding='utf-8').read()
+ content = re.sub(
+ r'(?m)^\.\. toctree::\r?\n((^$|^\s.*$)\r?\n)*', '', content)
+ return content
+
+
+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_carrier_carriage'
+
+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))
+
+local_version = []
+if os.environ.get('CI_JOB_ID'):
+ local_version.append(os.environ['CI_JOB_ID'])
+else:
+ for build in ['CI_BUILD_NUMBER', 'CI_JOB_NUMBER']:
+ if os.environ.get(build):
+ local_version.append(os.environ[build])
+ else:
+ local_version = []
+ break
+if local_version:
+ version += '+' + '.'.join(local_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'),
+ get_require_version('trytond_incoterm'),
+ get_require_version('trytond_purchase_shipment_cost'),
+ get_require_version('trytond_sale_shipment_cost'),
+ ]
+dependency_links = []
+if minor_version % 2:
+ dependency_links.append(
+ 'https://trydevpi.tryton.org/?local_version='
+ + '.'.join(local_version)
+ )
+
+setup(name=name,
+ version=version,
+ description='Tryton module to support multiple carrier',
+ long_description=read('README.rst'),
+ author='Tryton',
+ author_email='[email protected]',
+ url='http://www.tryton.org/',
+ download_url=download_url,
+ project_urls={
+ "Bug Tracker": 'https://bugs.tryton.org/',
+ "Documentation": (
+ 'https://docs.tryton.org/projects/modules-carrier-carriage'),
+ "Forum": 'https://www.tryton.org/forum',
+ "Source Code": 'https://hg.tryton.org/modules/carrier_carriage',
+ },
+ keywords='tryton carrier carriage shipment cost',
+ package_dir={'trytond.modules.carrier_carriage': '.'},
+ packages=(
+ ['trytond.modules.carrier_carriage']
+ + ['trytond.modules.carrier_carriage.%s' % p
+ for p in find_packages()]
+ ),
+ package_data={
+ 'trytond.modules.carrier_carriage': (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 :: Finnish',
+ 'Natural Language :: French',
+ 'Natural Language :: German',
+ 'Natural Language :: Hungarian',
+ 'Natural Language :: Indonesian',
+ 'Natural Language :: Italian',
+ 'Natural Language :: Persian',
+ 'Natural Language :: Polish',
+ 'Natural Language :: Portuguese (Brazilian)',
+ 'Natural Language :: Romanian',
+ 'Natural Language :: Russian',
+ 'Natural Language :: Slovenian',
+ 'Natural Language :: Spanish',
+ 'Natural Language :: Turkish',
+ 'Operating System :: OS Independent',
+ 'Programming Language :: Python :: 3',
+ 'Programming Language :: Python :: 3.7',
+ 'Programming Language :: Python :: 3.8',
+ 'Programming Language :: Python :: 3.9',
+ 'Programming Language :: Python :: 3.10',
+ 'Programming Language :: Python :: Implementation :: CPython',
+ 'Topic :: Office/Business',
+ ],
+ license='GPL-3',
+ python_requires='>=3.7',
+ install_requires=requires,
+ extras_require={
+ 'test': tests_require,
+ },
+ dependency_links=dependency_links,
+ zip_safe=False,
+ entry_points="""
+ [trytond.modules]
+ carrier_carriage = trytond.modules.carrier_carriage
+ """, # noqa: E501
+ )
diff -r 000000000000 -r 1fd7712198f9 stock.py
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/stock.py Sat Sep 10 17:35:38 2022 +0200
@@ -0,0 +1,222 @@
+# 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 (
+ ModelSQL, ModelView, Workflow, fields, sequence_ordered)
+from trytond.model.exceptions import AccessError
+from trytond.modules.stock_shipment_cost import ShipmentCostMixin
+from trytond.pool import Pool, PoolMeta
+from trytond.pyson import Eval
+
+try:
+ from trytond.modules.sale_shipment_cost import ShipmentCostSaleMixin
+except ImportError:
+ ShipmentCostSaleMixin = object
+
+
+class Carriage(sequence_ordered(), ShipmentCostMixin, ModelSQL, ModelView):
+ "Shipment Carriage"
+ __name__ = 'stock.shipment.carriage'
+
+ _states = {
+ 'readonly': Eval('shipment_cost_readonly', True),
+ }
+
+ shipment = fields.Reference(
+ "Shipment", selection='get_shipments',
+ required=True, select=True, states=_states)
+ type = fields.Selection([
+ ('before', "Before"),
+ ('after', "After"),
+ ], "Type", sort=False, required=True, states=_states)
+ from_ = fields.Many2One('party.address', "From", states=_states)
+ to = fields.Many2One('party.address', "To", states=_states)
+
+ company = fields.Function(
+ fields.Many2One('company.company', "Company"),
+ 'on_change_with_company')
+
+ del _states
+
+ @classmethod
+ def __setup__(cls):
+ super().__setup__()
+ cls.carrier.required = True
+
+ @classmethod
+ def get_shipments(cls):
+ pool = Pool()
+ IrModel = pool.get('ir.model')
+ get_name = IrModel.get_name
+ models = cls._get_shipments()
+ return [(m, get_name(m)) for m in models]
+
+ @classmethod
+ def _get_shipments(cls):
+ return [
+ 'stock.shipment.out',
+ 'stock.shipment.out.return',
+ ]
+
+ @fields.depends('shipment')
+ def on_change_with_shipment_cost_readonly(self, name=None):
+ pool = Pool()
+ ShipmentOut = pool.get('stock.shipment.out')
+ ShipmentOutReturn = pool.get('stock.shipment.out.return')
+ if isinstance(self.shipment, (ShipmentOut, ShipmentOutReturn)):
+ return self.shipment.state in {'done', 'cancelled'}
+
+ @fields.depends('shipment')
+ def on_change_with_company(self, name=None):
+ if self.shipment and self.shipment.company:
+ return self.shipment.company.id
+
+ def get_rec_name(self, name):
+ return f'{self.carrier.rec_name} @ {self.shipment.rec_name}'
+
+ @classmethod
+ def delete(cls, carriages):
+ for carriage in carriages:
+ if carriage.shipment_cost_readonly:
+ raise AccessError(
+ gettext('carrier_carriages.msg_shipment_carriage_delete',
+ carriage=carriage.rec_name))
+ super().delete(carriages)
+
+
+class _ShipmentMixin:
+ __slots__ = ()
+
+ _states = {
+ 'readonly': Eval('state') != 'draft',
+ }
+
+ carriages = fields.One2Many(
+ 'stock.shipment.carriage', 'shipment', "Carriages", readonly=True)
+ before_carriages = fields.One2Many(
+ 'stock.shipment.carriage', 'shipment', "Before Carriages",
+ filter=[
+ ('type', '=', 'before'),
+ ],
+ states=_states,
+ help="Carriages before the main carrier.")
+ after_carriages = fields.One2Many(
+ 'stock.shipment.carriage', 'shipment', "After Carriages",
+ filter=[
+ ('type', '=', 'after'),
+ ],
+ states=_states,
+ help="Carriages after the main carrier.")
+
+ del _states
+
+ def _get_shipment_cost(self):
+ cost = super()._get_shipment_cost()
+ for carriage in self.carriages:
+ carriage_cost = carriage._get_shipment_cost()
+ if carriage_cost:
+ cost += carriage_cost
+ return cost
+
+ @classmethod
+ def delete(cls, shipments):
+ pool = Pool()
+ Carriage = pool.get('stock.shipment.carriage')
+ carriages = sum((s.carriages for s in shipments), ())
+ super().delete(shipments)
+ Carriage.delete(carriages)
+
+
+class Carriage_Sale(ShipmentCostSaleMixin, metaclass=PoolMeta):
+ __name__ = 'stock.shipment.carriage'
+
+ @fields.depends('shipment')
+ def on_change_with_shipment_cost_sale_readonly(self, name=None):
+ pool = Pool()
+ ShipmentOut = pool.get('stock.shipment.out')
+ if isinstance(self.shipment, ShipmentOut):
+ return self.shipment.state in {'done', 'cancelled'}
+
+ def get_cost_invoice_line(self, invoice):
+ invoice_line = super().get_cost_invoice_line(invoice)
+ if invoice_line:
+ invoice_line.cost_shipment_carriages = [self]
+ return invoice_line
+
+ @classmethod
+ def from_sale(cls, carriage):
+ return cls(
+ sequence=carriage.sequence,
+ type=carriage.type,
+ carrier=carriage.carrier,
+ cost_method=carriage.cost_method,
+ from_=carriage.from_,
+ to=carriage.to,
+ )
+
+
+class _ShipmentOutMixin(_ShipmentMixin):
+
+ @classmethod
+ @ModelView.button
+ @Workflow.transition('done')
+ def done(cls, shipments):
+ pool = Pool()
+ Carriage = pool.get('stock.shipment.carriage')
+ has_cost_sale = hasattr(Carriage, 'cost_sale')
+ carriages = []
+ for shipment in shipments:
+ for carriage in shipment.carriages:
+ carriage.cost = carriage.cost_used
+ carriage.cost_currency = carriage.cost_currency_used
+ if has_cost_sale:
+ carriage.cost_sale = carriage.cost_sale_used
+ carriage.cost_sale_currency = (
+ carriage.cost_sale_currency_used)
+ carriages.append(carriage)
+ Carriage.save(carriages)
+ super().done(shipments)
+
+
+class ShipmentOut(_ShipmentOutMixin, metaclass=PoolMeta):
+ __name__ = 'stock.shipment.out'
+
+
+class ShipmentOutReturn(_ShipmentOutMixin, metaclass=PoolMeta):
+ __name__ = 'stock.shipment.out.return'
+
+
+class Carriage_Purchase(metaclass=PoolMeta):
+ __name__ = 'stock.shipment.carriage'
+
+ @classmethod
+ def _get_shipments(cls):
+ return super()._get_shipments() + ['stock.shipment.in']
+
+ @fields.depends('shipment')
+ def on_change_with_shipment_cost_readonly(self, name=None):
+ pool = Pool()
+ ShipmentIn = pool.get('stock.shipment.in')
+ readonly = super().on_change_with_shipment_cost_readonly(name=name)
+ if isinstance(self.shipment, ShipmentIn):
+ readonly = self.shipment.state != 'draft'
+ return readonly
+
+
+class ShipmentIn(_ShipmentMixin, metaclass=PoolMeta):
+ __name__ = 'stock.shipment.in'
+
+ @classmethod
+ @ModelView.button
+ @Workflow.transition('received')
+ def receive(cls, shipments):
+ pool = Pool()
+ Carriage = pool.get('stock.shipment.carriage')
+ carriages = []
+ for shipment in shipments:
+ for carriage in shipment.carriages:
+ carriage.cost = carriage.cost_used
+ carriage.cost_currency = carriage.cost_currency_used
+ Carriage.save(carriages)
+ super().receive(shipments)
diff -r 000000000000 -r 1fd7712198f9 stock.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/stock.xml Sat Sep 10 17:35:38 2022 +0200
@@ -0,0 +1,66 @@
+<?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="shipment_carriage_view_form">
+ <field name="model">stock.shipment.carriage</field>
+ <field name="type">form</field>
+ <field name="name">shipment_carriage_form</field>
+ </record>
+
+ <record model="ir.ui.view" id="shipment_carriage_view_list">
+ <field name="model">stock.shipment.carriage</field>
+ <field name="type">tree</field>
+ <field name="name">shipment_carriage_list</field>
+ </record>
+
+ <record model="ir.model.access" id="access_shipment_carriage">
+ <field name="model" search="[('model', '=',
'stock.shipment.carriage')]"/>
+ <field name="perm_read" eval="False"/>
+ <field name="perm_write" eval="False"/>
+ <field name="perm_create" eval="False"/>
+ <field name="perm_delete" eval="False"/>
+ </record>
+ <record model="ir.model.access"
id="access_shipment_carriage_group_stock">
+ <field name="model" search="[('model', '=',
'stock.shipment.carriage')]"/>
+ <field name="group" ref="stock.group_stock"/>
+ <field name="perm_read" eval="True"/>
+ <field name="perm_write" eval="True"/>
+ <field name="perm_create" eval="True"/>
+ <field name="perm_delete" eval="True"/>
+ </record>
+
+ <record model="ir.ui.view" id="shipment_out_view_form">
+ <field name="model">stock.shipment.out</field>
+ <field name="inherit" ref="stock.shipment_out_view_form"/>
+ <field name="name">shipment_form</field>
+ </record>
+
+ <record model="ir.ui.view" id="shipment_out_return_view_form">
+ <field name="model">stock.shipment.out.return</field>
+ <field name="inherit" ref="stock.shipment_out_return_view_form"/>
+ <field name="name">shipment_form</field>
+ </record>
+ </data>
+ <data depends="sale_shipment_cost">
+ <record model="ir.ui.view" id="shipment_carriage_view_form_sale">
+ <field name="model">stock.shipment.carriage</field>
+ <field name="inherit" ref="shipment_carriage_view_form"/>
+ <field name="name">shipment_carriage_form_sale</field>
+ </record>
+
+ <record model="ir.ui.view" id="shipment_carriage_view_list_sale">
+ <field name="model">stock.shipment.carriage</field>
+ <field name="inherit" ref="shipment_carriage_view_list"/>
+ <field name="name">shipment_carriage_list_sale</field>
+ </record>
+ </data>
+ <data depends="purchase_shipment_cost">
+ <record model="ir.ui.view" id="shipment_in_view_form">
+ <field name="model">stock.shipment.in</field>
+ <field name="inherit" ref="stock.shipment_in_view_form"/>
+ <field name="name">shipment_form</field>
+ </record>
+ </data>
+</tryton>
diff -r 000000000000 -r 1fd7712198f9 tests/__init__.py
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/__init__.py Sat Sep 10 17:35:38 2022 +0200
@@ -0,0 +1,2 @@
+# This file is part of Tryton. The COPYRIGHT file at the top level of
+# this repository contains the full copyright notices and license terms.
diff -r 000000000000 -r 1fd7712198f9 tests/scenario_carrier_carriage.rst
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/scenario_carrier_carriage.rst Sat Sep 10 17:35:38 2022 +0200
@@ -0,0 +1,167 @@
+=========================
+Carrier Carriage Scenario
+=========================
+
+Imports::
+
+ >>> from decimal import Decimal
+
+ >>> from proteus import Model, Wizard
+ >>> from trytond.tests.tools import activate_modules
+ >>> from trytond.modules.account.tests.tools import (
+ ... create_chart, get_accounts)
+ >>> from trytond.modules.company.tests.tools import (
+ ... create_company, get_company)
+
+Activate modules::
+
+ >>> config = activate_modules(['carrier_carriage', 'sale_shipment_cost'])
+
+ >>> Carrier = Model.get('carrier')
+ >>> Party = Model.get('party.party')
+ >>> ProductCategory = Model.get('product.category')
+ >>> ProductTemplate = Model.get('product.template')
+ >>> ProductUom = Model.get('product.uom')
+ >>> Sale = Model.get('sale.sale')
+
+Create company::
+
+ >>> _ = create_company()
+ >>> company = get_company()
+
+Create chart of accounts::
+
+ >>> _ = create_chart(company)
+ >>> accounts = get_accounts(company)
+
+Create customer::
+
+ >>> customer = Party(name='Customer')
+ >>> customer.save()
+
+Create account category::
+
+ >>> account_category = ProductCategory(name="Account Category")
+ >>> account_category.accounting = True
+ >>> account_category.account_revenue = accounts['revenue']
+ >>> account_category.save()
+
+Create products::
+
+ >>> unit, = ProductUom.find([('name', '=', 'Unit')])
+
+ >>> template = ProductTemplate()
+ >>> template.name = "Product"
+ >>> template.default_uom = unit
+ >>> template.type = 'goods'
+ >>> template.salable = True
+ >>> template.list_price = Decimal('20')
+ >>> template.account_category = account_category
+ >>> template.save()
+ >>> product, = template.products
+
+ >>> carrier_template1 = ProductTemplate()
+ >>> carrier_template1.name = "Carrier Product 1"
+ >>> carrier_template1.default_uom = unit
+ >>> carrier_template1.type = 'service'
+ >>> carrier_template1.salable = True
+ >>> carrier_template1.list_price = Decimal('3')
+ >>> carrier_template1.account_category = account_category
+ >>> carrier_template1.save()
+ >>> carrier_product1, = carrier_template1.products
+ >>> carrier_product1.cost_price = Decimal('2')
+ >>> carrier_product1.save()
+
+ >>> carrier_template2 = ProductTemplate()
+ >>> carrier_template2.name = "Carrier Product 2"
+ >>> carrier_template2.default_uom = unit
+ >>> carrier_template2.type = 'service'
+ >>> carrier_template2.salable = True
+ >>> carrier_template2.list_price = Decimal('2')
+ >>> carrier_template2.account_category = account_category
+ >>> carrier_template2.save()
+ >>> carrier_product2, = carrier_template2.products
+ >>> carrier_product2.cost_price = Decimal('1')
+ >>> carrier_product2.save()
+
+Create carriers::
+
+ >>> carrier1 = Carrier()
+ >>> carrier1.party = Party(name="Carrier 1")
+ >>> carrier1.party.save()
+ >>> carrier1.carrier_product = carrier_product1
+ >>> carrier1.save()
+
+ >>> carrier2 = Carrier()
+ >>> carrier2.party = Party(name="Carrier 2")
+ >>> carrier2.party.save()
+ >>> carrier2.carrier_product = carrier_product2
+ >>> carrier2.save()
+
+Sale products with cost on shipment::
+
+ >>> sale = Sale()
+ >>> sale.party = customer
+ >>> sale.carrier = carrier1
+ >>> sale.invoice_method = 'shipment'
+ >>> sale.shipment_cost_method = 'shipment'
+ >>> before_carriage = sale.before_carriages.new(type='before')
+ >>> before_carriage.carrier = carrier2
+ >>> before_carriage.cost_method = 'shipment'
+ >>> line = sale.lines.new()
+ >>> line.product = product
+ >>> line.quantity = 10.0
+ >>> sale.untaxed_amount
+ Decimal('200.00')
+ >>> sale.click('quote')
+ >>> sale.untaxed_amount
+ Decimal('205.00')
+ >>> len(sale.lines)
+ 3
+ >>> sale.click('confirm')
+ >>> sale.click('process')
+ >>> sale.click('process')
+ >>> sale.state
+ 'processing'
+
+Check shipment::
+
+ >>> shipment, = sale.shipments
+ >>> shipment.carrier == carrier1
+ True
+ >>> shipment.cost_used
+ Decimal('2.0000')
+ >>> shipment.cost_sale_used
+ Decimal('3.0000')
+
+ >>> carriage, = shipment.before_carriages
+ >>> carriage.carrier == carrier2
+ True
+ >>> carriage.cost_used
+ Decimal('1.0000')
+ >>> carriage.cost_sale_used
+ Decimal('2.0000')
+
+Send products::
+
+ >>> shipment.click('assign_force')
+ >>> shipment.click('pick')
+ >>> shipment.click('pack')
+ >>> shipment.click('done')
+ >>> shipment.state
+ 'done'
+
+ >>> shipment.cost_invoice_line.amount
+ Decimal('3.00')
+ >>> carriage, = shipment.before_carriages
+ >>> carriage.cost_invoice_line.amount
+ Decimal('2.00')
+
+Check customer invoice::
+
+ >>> sale.reload()
+ >>> invoice, = sale.invoices
+ >>> invoice.untaxed_amount
+ Decimal('205.00')
+ >>> len(invoice.lines)
+ 3
diff -r 000000000000 -r 1fd7712198f9 tests/test_module.py
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test_module.py Sat Sep 10 17:35:38 2022 +0200
@@ -0,0 +1,12 @@
+# 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.tests.test_tryton import ModuleTestCase
+
+
+class CarrierCarriageTestCase(ModuleTestCase):
+ "Test Carrier Carriage module"
+ module = 'carrier_carriage'
+ extras = ['incoterm', 'purchase_shipment_cost', 'sale_shipment_cost']
+
+
+del ModuleTestCase
diff -r 000000000000 -r 1fd7712198f9 tests/test_scenario.py
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test_scenario.py Sat Sep 10 17:35:38 2022 +0200
@@ -0,0 +1,8 @@
+# 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.tests.test_tryton import load_doc_tests
+
+
+def load_tests(*args, **kwargs):
+ return load_doc_tests(__name__, __file__, *args, **kwargs)
diff -r 000000000000 -r 1fd7712198f9 tox.ini
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tox.ini Sat Sep 10 17:35:38 2022 +0200
@@ -0,0 +1,17 @@
+[tox]
+envlist = {py37,py38,py39,py310}-{sqlite,postgresql}
+
+[testenv]
+extras = test
+commands =
+ coverage run --include=.*/carrier_carriage/* -m unittest discover -s tests
+ coverage report --include=.*/carrier_carriage/* --omit=*/tests/*
+deps =
+ coverage
+ postgresql: psycopg2 >= 2.7.0
+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/?local_version={env:CI_JOB_ID:{env:CI_BUILD_NUMBER:}.{env:CI_JOB_NUMBER:}}
{opts} {packages}
diff -r 000000000000 -r 1fd7712198f9 tryton.cfg
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tryton.cfg Sat Sep 10 17:35:38 2022 +0200
@@ -0,0 +1,18 @@
+[tryton]
+version=6.5.0
+depends:
+ carrier
+ ir
+ stock
+ stock_shipment_cost
+extras_depend:
+ account_invoice
+ incoterm
+ purchase_shipment_cost
+ sale
+ sale_shipment_cost
+xml:
+ stock.xml
+ sale.xml
+ incoterm.xml
+ message.xml
diff -r 000000000000 -r 1fd7712198f9 view/incoterm_form.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/view/incoterm_form.xml Sat Sep 10 17:35:38 2022 +0200
@@ -0,0 +1,11 @@
+<?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='location']" position="after">
+ <label name="before_carrier"/>
+ <field name="before_carrier"/>
+ <label name="after_carrier"/>
+ <field name="after_carrier"/>
+ </xpath>
+</data>
diff -r 000000000000 -r 1fd7712198f9 view/incoterm_list.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/view/incoterm_list.xml Sat Sep 10 17:35:38 2022 +0200
@@ -0,0 +1,11 @@
+<?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='carrier']" position="before">
+ <field name="before_carrier" optional="1"/>
+ </xpath>
+ <xpath expr="//field[@name='carrier']" position="after">
+ <field name="after_carrier" optional="1"/>
+ </xpath>
+</data>
diff -r 000000000000 -r 1fd7712198f9 view/sale_carriage_form.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/view/sale_carriage_form.xml Sat Sep 10 17:35:38 2022 +0200
@@ -0,0 +1,23 @@
+<?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. -->
+<form>
+ <label name="sale"/>
+ <field name="sale"/>
+ <label name="sequence"/>
+ <field name="sequence"/>
+
+ <label name="carrier"/>
+ <field name="carrier"/>
+ <label name="type"/>
+ <field name="type"/>
+
+ <label name="cost_method"/>
+ <field name="cost_method"/>
+ <newline/>
+
+ <label name="from_"/>
+ <field name="from_"/>
+ <label name="to"/>
+ <field name="to"/>
+</form>
diff -r 000000000000 -r 1fd7712198f9 view/sale_carriage_list.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/view/sale_carriage_list.xml Sat Sep 10 17:35:38 2022 +0200
@@ -0,0 +1,11 @@
+<?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. -->
+<tree editable="1" sequence="sequence">
+ <field name="sale" expand="2"/>
+ <field name="type" optional="1"/>
+ <field name="carrier" expand="2"/>
+ <field name="cost_method" expand="1"/>
+ <field name="from_" expand="1" optional="0"/>
+ <field name="to" expand="1" optional="0"/>
+</tree>
diff -r 000000000000 -r 1fd7712198f9 view/sale_form.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/view/sale_form.xml Sat Sep 10 17:35:38 2022 +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="//page[@id='other']" position="before">
+ <page id="carriages" string="Carriages">
+ <field name="before_carriages" colspan="4"/>
+
+ <label name="carrier"/>
+ <field name="carrier"/>
+
+ <field name="after_carriages" colspan="4"/>
+ </page>
+ </xpath>
+</data>
diff -r 000000000000 -r 1fd7712198f9 view/shipment_carriage_form.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/view/shipment_carriage_form.xml Sat Sep 10 17:35:38 2022 +0200
@@ -0,0 +1,26 @@
+<?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. -->
+<form>
+ <label name="shipment"/>
+ <field name="shipment"/>
+ <label name="sequence"/>
+ <field name="sequence"/>
+
+ <label name="carrier"/>
+ <field name="carrier"/>
+ <label name="type"/>
+ <field name="type"/>
+
+ <label name="from_"/>
+ <field name="from_"/>
+ <label name="to"/>
+ <field name="to"/>
+
+ <label name="cost_used"/>
+ <group id="cost_used" col="-1" colspan="3">
+ <field name="cost_used" xexpand="0"/>
+ <field name="cost_currency_used"/>
+ <field name="cost_edit" xexpand="0" xalign="0"/>
+ </group>
+</form>
diff -r 000000000000 -r 1fd7712198f9 view/shipment_carriage_form_sale.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/view/shipment_carriage_form_sale.xml Sat Sep 10 17:35:38 2022 +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. -->
+<data>
+ <xpath expr="//group[@id='cost_used']" position="after">
+ <label name="cost_sale_used"/>
+ <group id="cost_sale_used" col="-1" colspan="3">
+ <field name="cost_sale_used" xexpand="0"/>
+ <field name="cost_sale_currency_used"/>
+ </group>
+ </xpath>
+</data>
diff -r 000000000000 -r 1fd7712198f9 view/shipment_carriage_list.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/view/shipment_carriage_list.xml Sat Sep 10 17:35:38 2022 +0200
@@ -0,0 +1,11 @@
+<?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. -->
+<tree sequence="sequence">
+ <field name="shipment" expand="2"/>
+ <field name="type" optional="1"/>
+ <field name="carrier" expand="2"/>
+ <field name="cost_used" symbol="cost_currency_used"/>
+ <field name="from_" expand="1" optional="1"/>
+ <field name="to" expand="1" optional="1"/>
+</tree>
diff -r 000000000000 -r 1fd7712198f9 view/shipment_carriage_list_sale.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/view/shipment_carriage_list_sale.xml Sat Sep 10 17:35:38 2022 +0200
@@ -0,0 +1,8 @@
+<?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='cost_used']" position="after">
+ <field name="cost_sale_used" symbol="cost_sale_currency_used"/>
+ </xpath>
+</data>
diff -r 000000000000 -r 1fd7712198f9 view/shipment_form.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/view/shipment_form.xml Sat Sep 10 17:35:38 2022 +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="//page[@id='costs']" position="inside">
+ <field name="before_carriages" colspan="4"/>
+
+ <field name="after_carriages" colspan="4"/>
+ </xpath>
+</data>
