diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 81b3f65..54464d2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -45,7 +45,7 @@ test_all_modules: --db_password flectra --database test_all --test-enable - --init partner_address_version,partner_firstname,partner_contact_job_position,partner_fax,partner_employee_quantity,base_location_nuts,partner_contact_age_range,partner_second_lastname,partner_contact_department,partner_contact_nationality,partner_phone_secondary,partner_affiliate,partner_tier_validation,partner_phone_extension,partner_priority,partner_ref_unique,animal,partner_industry_secondary,partner_helper,base_partner_sequence,partner_multi_relation,partner_iterative_archive,partner_address_street3,partner_company_type,portal_partner_select_all,base_location_geonames_import,partner_contact_birthdate,partner_identification,partner_vat_unique,partner_contact_access_link,partner_contact_personal_information_page,partner_contact_gender,partner_contact_lang,base_location,partner_contact_in_several_companies,partner_company_group,base_country_state_translatable + --init partner_address_version,partner_firstname,partner_contact_job_position,partner_fax,partner_employee_quantity,partner_tz,base_location_nuts,partner_contact_age_range,partner_second_lastname,partner_contact_department,partner_contact_nationality,partner_phone_secondary,partner_affiliate,partner_tier_validation,partner_phone_extension,partner_priority,partner_ref_unique,animal,partner_industry_secondary,partner_helper,base_partner_sequence,partner_multi_relation,partner_iterative_archive,partner_address_street3,partner_company_type,portal_partner_select_all,base_location_geonames_import,partner_contact_birthdate,partner_identification,partner_vat_unique,partner_contact_access_link,partner_contact_personal_information_page,partner_contact_gender,partner_contact_lang,base_location,partner_contact_in_several_companies,partner_company_group,base_country_state_translatable --stop-after-init --log-level error --log-handler flectra.addons.partner_address_version:TEST @@ -53,6 +53,7 @@ test_all_modules: --log-handler flectra.addons.partner_contact_job_position:TEST --log-handler flectra.addons.partner_fax:TEST --log-handler flectra.addons.partner_employee_quantity:TEST + --log-handler flectra.addons.partner_tz:TEST --log-handler flectra.addons.base_location_nuts:TEST --log-handler flectra.addons.partner_contact_age_range:TEST --log-handler flectra.addons.partner_second_lastname:TEST @@ -258,6 +259,40 @@ test_module_partner_employee_quantity: --log-level error --log-handler flectra.addons.partner_employee_quantity:TEST" +test_module_partner_tz: + stage: testsingle + when: on_failure + image: + name: registry.gitlab.com/jamotion/flectra/ubuntudev:2-latest + entrypoint: ["/bin/sh", "-c"] + script: + - apt-get install -y p7zip-full + - apt install -y expect-dev + - su - flectra -c "mkdir ~/others" + - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/server-tools.git ~/others/server-tools" + - su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/server-ux.git ~/others/server-ux" + - sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && dpkg-reconfigure --frontend=noninteractive locales && update-locale LANG=en_US.UTF-8 + - mkdir ${CI_PROJECT_DIR}/ci_data + - wget -O ${CI_PROJECT_DIR}/ci_data/test_base.zip https://gitlab.com/flectra-community/devops/oca2fc/raw/master/ci_data/test_base.zip + - 7z x -o ${CI_PROJECT_DIR}/ci_data/ ${CI_PROJECT_DIR}/ci_data/test_base.zip + - export PGPASSWORD="flectra" + - createdb -h psql -U flectra -O flectra -T template1 test_partner_tz + - psql -h psql -U flectra -d test_partner_tz -f ${CI_PROJECT_DIR}/ci_data/dump.sql + - su - flectra -c "mkdir -p ~/.local/share/filestore" + - mv ${CI_PROJECT_DIR}/ci_data/filestore /opt/flectra/.local/share/filestore/test_partner_tz + - chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_partner_tz + - su - flectra -c "/opt/flectra/flectra-bin + --addons-path ${CI_PROJECT_DIR},~/others/server-tools,~/others/server-ux + --db_host psql + --db_port 5432 + --db_user flectra + --db_password flectra + --database test_partner_tz + --test-enable -i partner_tz + --stop-after-init + --log-level error + --log-handler flectra.addons.partner_tz:TEST" + test_module_base_location_nuts: stage: testsingle when: on_failure diff --git a/README.md b/README.md index 87e6735..673f7b3 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,7 @@ addon | version | summary [partner_contact_job_position](partner_contact_job_position/) | 2.0.1.0.0| Categorize job positions for contacts [partner_fax](partner_fax/) | 2.0.1.0.0| Add fax number on partner [partner_employee_quantity](partner_employee_quantity/) | 2.0.1.0.0| Know how many employees a partner has +[partner_tz](partner_tz/) | 2.0.1.0.0| Remove partner timezone default value and display on form [base_location_nuts](base_location_nuts/) | 2.0.1.0.1| NUTS Regions [partner_contact_age_range](partner_contact_age_range/) | 2.0.1.0.1| Age Range for Contact's [partner_second_lastname](partner_second_lastname/) | 2.0.1.0.0| Have split first and second lastnames @@ -42,7 +43,7 @@ addon | version | summary [partner_contact_personal_information_page](partner_contact_personal_information_page/) | 2.0.1.0.0| Add a page to contacts form to put personal information [partner_contact_gender](partner_contact_gender/) | 2.0.1.0.1| Add gender field to contacts [partner_contact_lang](partner_contact_lang/) | 2.0.1.0.0| Manage language in contacts -[base_location](base_location/) | 2.0.1.0.1| Enhanced zip/npa management system +[base_location](base_location/) | 2.0.1.1.0| Enhanced zip/npa management system [partner_contact_in_several_companies](partner_contact_in_several_companies/) | 2.0.1.1.0| Allow to have one contact in several partners [partner_company_group](partner_company_group/) | 2.0.1.0.1| Adds the possibility to add a company group to a company [base_country_state_translatable](base_country_state_translatable/) | 2.0.1.0.0| Translate Country States diff --git a/animal/i18n/animal.pot b/animal/i18n/animal.pot index b5f1769..85336f0 100644 --- a/animal/i18n/animal.pot +++ b/animal/i18n/animal.pot @@ -405,6 +405,11 @@ msgstr "" msgid "Messages" msgstr "" +#. module: animal +#: model:ir.model.fields,field_description:animal.field_animal__my_activity_date_deadline +msgid "My Activity Deadline" +msgstr "" + #. module: animal #: model:ir.model.fields,field_description:animal.field_animal__name #: model:ir.model.fields,field_description:animal.field_animal_breed__name diff --git a/animal/i18n/es.po b/animal/i18n/es.po index 97b4f0f..c0332e8 100644 --- a/animal/i18n/es.po +++ b/animal/i18n/es.po @@ -10,11 +10,11 @@ msgstr "" "PO-Revision-Date: 2021-03-09 21:35+0000\n" "Last-Translator: \n" "Language-Team: \n" +"Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: \n" -"Language: es\n" "X-Generator: Poedit 2.4.2\n" #. module: animal @@ -194,8 +194,8 @@ msgstr "Crear un especie." #. module: animal #: model_terms:ir.actions.act_window,help:animal.action_animal -msgid "Create an animal." -msgstr "Crear un animal." +msgid "Create an animal" +msgstr "" #. module: animal #: model:ir.model.fields,field_description:animal.field_animal__create_uid @@ -335,6 +335,7 @@ msgstr "Si está marcado, nuevos mensajes requieren tu atención." #. module: animal #: model:ir.model.fields,help:animal.field_animal__message_has_error +#: model:ir.model.fields,help:animal.field_animal__message_has_sms_error msgid "If checked, some messages have a delivery error." msgstr "Si está marcado, algunos mensajes tienen un error en la entrega." @@ -408,6 +409,11 @@ msgstr "Error de entrega del mensaje" msgid "Messages" msgstr "Mensajes" +#. module: animal +#: model:ir.model.fields,field_description:animal.field_animal__my_activity_date_deadline +msgid "My Activity Deadline" +msgstr "" + #. module: animal #: model:ir.model.fields,field_description:animal.field_animal__name #: model:ir.model.fields,field_description:animal.field_animal_breed__name @@ -488,6 +494,11 @@ msgstr "Usuario responsable" msgid "Rottweiler" msgstr "Rottweiler" +#. module: animal +#: model:ir.model.fields,field_description:animal.field_animal__message_has_sms_error +msgid "SMS Delivery error" +msgstr "" + #. module: animal #: model:animal.color,name:animal.salt msgid "Salt and pepper" @@ -563,6 +574,16 @@ msgstr "Nuevos mensajes" msgid "Unread Messages Counter" msgstr "Contador de mensajes sin leer" +#. module: animal +#: model:ir.model.fields,field_description:animal.field_animal__website_message_ids +msgid "Website Messages" +msgstr "" + +#. module: animal +#: model:ir.model.fields,help:animal.field_animal__website_message_ids +msgid "Website communication history" +msgstr "" + #. module: animal #: model:ir.model.fields,field_description:animal.field_animal__weight msgid "Weight (in kg)" @@ -577,3 +598,6 @@ msgstr "Yorkshire Terrier" #: model_terms:ir.ui.view,arch_db:animal.view_animal_color_tree msgid "colors" msgstr "colores" + +#~ msgid "Create an animal." +#~ msgstr "Crear un animal." diff --git a/base_location/__manifest__.py b/base_location/__manifest__.py index 26aba11..7e1ac5b 100644 --- a/base_location/__manifest__.py +++ b/base_location/__manifest__.py @@ -4,7 +4,7 @@ { "name": "Location management (aka Better ZIP)", - "version": "2.0.1.0.1", + "version": "2.0.1.1.0", "depends": ["base_address_city", "contacts"], "author": ( "Camptocamp," diff --git a/base_location/models/res_partner.py b/base_location/models/res_partner.py index 44b2a58..89928c3 100644 --- a/base_location/models/res_partner.py +++ b/base_location/models/res_partner.py @@ -9,9 +9,6 @@ from flectra.exceptions import ValidationError class ResPartner(models.Model): _inherit = "res.partner" - allowed_zip_ids = fields.Many2many( - comodel_name="res.city.zip", compute="_compute_allowed_zip_ids" - ) zip_id = fields.Many2one( comodel_name="res.city.zip", string="ZIP Location", @@ -19,7 +16,9 @@ class ResPartner(models.Model): compute="_compute_zip_id", readonly=False, store=True, - domain="[('id', 'in', allowed_zip_ids)]", + domain="[('city_id', '=?', city_id), " + "('city_id.country_id', '=?', country_id), " + "('city_id.state_id', '=?', state_id)]", ) city_id = fields.Many2one( index=True, # add index for performance @@ -34,15 +33,6 @@ class ResPartner(models.Model): ) state_id = fields.Many2one(compute="_compute_state_id", readonly=False, store=True) - @api.depends("city_id") - def _compute_allowed_zip_ids(self): - for record in self: - if record.city_id: - domain = [("city_id", "=", record.city_id.id)] - else: - domain = [] - record.allowed_zip_ids = self.env["res.city.zip"].search(domain) - @api.depends("state_id", "country_id") def _compute_zip_id(self): """Empty the zip auto-completion field if data mismatch when on UI.""" diff --git a/base_location/tests/test_base_location.py b/base_location/tests/test_base_location.py index 8024fc5..439602e 100644 --- a/base_location/tests/test_base_location.py +++ b/base_location/tests/test_base_location.py @@ -185,10 +185,6 @@ class TestBaseLocation(common.SavepointCase): self.city_bcn.country_id.enforce_cities = False partner.city_id = self.city_bcn self.assertFalse(partner.zip_id) - partner.city_id = self.env["res.city"] - self.assertEqual( - len(partner.allowed_zip_ids), self.env["res.city.zip"].search_count([]) - ) def test_partner_onchange_state(self): """Test partner onchange state_id""" diff --git a/base_location/views/res_partner_view.xml b/base_location/views/res_partner_view.xml index 56454d0..b612102 100644 --- a/base_location/views/res_partner_view.xml +++ b/base_location/views/res_partner_view.xml @@ -6,7 +6,7 @@ - + - + + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +our General Public Licenses are intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU Affero General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU Affero General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU Affero General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU Affero General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU Affero General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published + by the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU AGPL, see +. \ No newline at end of file diff --git a/partner_tz/README.rst b/partner_tz/README.rst new file mode 100644 index 0000000..e8453c4 --- /dev/null +++ b/partner_tz/README.rst @@ -0,0 +1,100 @@ +================ +Partner timezone +================ + +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |badge1| image:: https://img.shields.io/badge/maturity-Alpha-red.png + :target: https://odoo-community.org/page/development-status + :alt: Alpha +.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 +.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fpartner--contact-lightgray.png?logo=github + :target: https://github.com/OCA/partner-contact/tree/14.0/partner_tz + :alt: OCA/partner-contact +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/partner-contact-14-0/partner-contact-14-0-partner_tz + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/134/14.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + +This module displays the timezone field on partner form view. +Moreover it provides a few tools function in `tools/tz_utils.py`. + +.. IMPORTANT:: + This is an alpha version, the data model and design can change at any time without warning. + Only for development or testing purpose, do not use in production. + `More details on development status `_ + +**Table of contents** + +.. contents:: + :local: + +Known issues / Roadmap +====================== + +* Odoo default value for timezone field uses the tz set on the connected user. + So if a user creates a partner located in a different timezone than his own, + the created partner will be set in the user's timezone instead of having the + timezone from its own location. + Ideally, we should change this behaviour to get the timezone from the country + and city of the partner when they are defined. + http://www.geonames.org/export/web-services.html#timezone might be a good + starting point. + +Bug Tracker +=========== + +Bugs are tracked on `GitHub Issues `_. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us smashing it by providing a detailed and welcomed +`feedback `_. + +Do not contact contributors directly about support or help with technical issues. + +Credits +======= + +Authors +~~~~~~~ + +* Camptocamp + +Contributors +~~~~~~~~~~~~ + +* Akim Juillerat +* Hiep (Nguyen Hoang) +* Phuc (Tran Thanh) + +Other credits +~~~~~~~~~~~~~ + +The development of this module has been financially supported by: + +* Camptocamp + +Maintainers +~~~~~~~~~~~ + +This module is maintained by the OCA. + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org + +OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use. + +This module is part of the `OCA/partner-contact `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. \ No newline at end of file diff --git a/partner_tz/__init__.py b/partner_tz/__init__.py new file mode 100644 index 0000000..fa947c5 --- /dev/null +++ b/partner_tz/__init__.py @@ -0,0 +1 @@ +from . import tools diff --git a/partner_tz/__manifest__.py b/partner_tz/__manifest__.py new file mode 100644 index 0000000..5c342c0 --- /dev/null +++ b/partner_tz/__manifest__.py @@ -0,0 +1,16 @@ +# Copyright 2020 Camptocamp SA +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl) +{ + "name": "Partner timezone", + "summary": "Remove partner timezone default value and display on form", + "version": "2.0.1.0.0", + "development_status": "Alpha", + "category": "Uncategorized", + "website": "https://gitlab.com/flectra-community/partner-contact", + "author": "Camptocamp, Odoo Community Association (OCA)", + "license": "AGPL-3", + "application": False, + "installable": True, + "depends": ["base"], + "data": ["views/res_partner.xml"], +} diff --git a/partner_tz/i18n/partner_tz.pot b/partner_tz/i18n/partner_tz.pot new file mode 100644 index 0000000..4d8b20f --- /dev/null +++ b/partner_tz/i18n/partner_tz.pot @@ -0,0 +1,13 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 14.0\n" +"Report-Msgid-Bugs-To: \n" +"Last-Translator: \n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" diff --git a/partner_tz/static/description/icon.png b/partner_tz/static/description/icon.png new file mode 100644 index 0000000..3a0328b Binary files /dev/null and b/partner_tz/static/description/icon.png differ diff --git a/partner_tz/static/description/index.html b/partner_tz/static/description/index.html new file mode 100644 index 0000000..56c84cd --- /dev/null +++ b/partner_tz/static/description/index.html @@ -0,0 +1,450 @@ + + + + + + +Partner timezone + + + +
+

Partner timezone

+ + +

Alpha License: AGPL-3 OCA/partner-contact Translate me on Weblate Try me on Runbot

+

This module displays the timezone field on partner form view. +Moreover it provides a few tools function in tools/tz_utils.py.

+
+

Important

+

This is an alpha version, the data model and design can change at any time without warning. +Only for development or testing purpose, do not use in production. +More details on development status

+
+

Table of contents

+ +
+

Known issues / Roadmap

+
    +
  • Odoo default value for timezone field uses the tz set on the connected user. +So if a user creates a partner located in a different timezone than his own, +the created partner will be set in the user’s timezone instead of having the +timezone from its own location. +Ideally, we should change this behaviour to get the timezone from the country +and city of the partner when they are defined. +http://www.geonames.org/export/web-services.html#timezone might be a good +starting point.
    • +
+
+
+

Bug Tracker

+

Bugs are tracked on GitHub Issues. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us smashing it by providing a detailed and welcomed +feedback.

+

Do not contact contributors directly about support or help with technical issues.

+
+
+

Credits

+
+

Authors

+
    +
  • Camptocamp
    • +
+
+
+

Contributors

+ +
+
+

Other credits

+

The development of this module has been financially supported by:

+
    +
  • Camptocamp
    • +
+
+
+

Maintainers

+

This module is maintained by the OCA.

+Odoo Community Association +

OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use.

+

This module is part of the OCA/partner-contact project on GitHub.

+

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

+
+
+
+ + diff --git a/partner_tz/tools/__init__.py b/partner_tz/tools/__init__.py new file mode 100644 index 0000000..3642078 --- /dev/null +++ b/partner_tz/tools/__init__.py @@ -0,0 +1,6 @@ +from .tz_utils import tz_to_tz_naive_datetime +from .tz_utils import tz_to_utc_naive_datetime +from .tz_utils import utc_to_tz_naive_datetime +from .tz_utils import tz_to_tz_time +from .tz_utils import tz_to_utc_time +from .tz_utils import utc_to_tz_time diff --git a/partner_tz/tools/tz_utils.py b/partner_tz/tools/tz_utils.py new file mode 100644 index 0000000..e1b5a8c --- /dev/null +++ b/partner_tz/tools/tz_utils.py @@ -0,0 +1,58 @@ +# Copyright 2020 Camptocamp SA +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl) +from datetime import date, datetime + +import pytz + +UTC_TZ = pytz.timezone("UTC") + + +def tz_to_tz_naive_datetime(from_tz, to_tz, date_time): + """ + Convert tz-naive datetime from a specifc tz to a tz-naive datetime of a specific tz + + :param from_tz: pytz.timezone object or tz selection value + :param to_tz: pytz.timezone object or tz selection value + :param date_time: tz-naive datetime.datetime object + :return: tz-naive datetime.datetime object + """ + if isinstance(from_tz, str): + from_tz = pytz.timezone(from_tz) + if isinstance(to_tz, str): + to_tz = pytz.timezone(to_tz) + return from_tz.localize(date_time).astimezone(to_tz).replace(tzinfo=None) + + +def tz_to_utc_naive_datetime(from_tz, date_time): + return tz_to_tz_naive_datetime(from_tz, UTC_TZ, date_time) + + +def utc_to_tz_naive_datetime(to_tz, date_time): + return tz_to_tz_naive_datetime(UTC_TZ, to_tz, date_time) + + +def tz_to_tz_time(from_tz, to_tz, time, base_date=None): + """ + Convert datetime.time from a specific tz to a datetime.time of a specific tz + + :param from_tz: pytz.timezone object or tz selection value + :param to_tz: pytz.timezone object or tz selection value + :param time: datetime.time object + :param base_date: OPTIONAL datetime.date or datetime.datetime object to use + for the conversion + :return: datetime.time object + """ + # Combine time with a date + if base_date is None: + base_date = date.today() + date_time = datetime.combine(base_date, time) + new_date_time = tz_to_tz_naive_datetime(from_tz, to_tz, date_time) + return new_date_time.time() + + +def tz_to_utc_time(from_tz, time, base_date=None): + return tz_to_tz_time(from_tz, UTC_TZ, time, base_date=base_date) + + +def utc_to_tz_time(to_tz, time, base_date=None): + return tz_to_tz_time(UTC_TZ, to_tz, time, base_date=base_date) diff --git a/partner_tz/views/res_partner.xml b/partner_tz/views/res_partner.xml new file mode 100644 index 0000000..ca873b7 --- /dev/null +++ b/partner_tz/views/res_partner.xml @@ -0,0 +1,13 @@ + + + + res.partner.form.inherit + res.partner + + + + + + + +