Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[17.0] [MIG] tg_base #6

Merged
merged 6 commits into from
Sep 19, 2024
Merged

Conversation

kwhatk0k3
Copy link

[17.0] [MIG] tg_base

Copy link
Member

@em230418 em230418 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Помимо комментариев ниже замечу, что не должно быть несколько коммитов вида "Migration to 17.0". Слей все в один коммит.

Comment on lines 3 to 16
<record id="country_view_search" model="ir.ui.view">
<field name="name">res.country.search.tg</field>
<field name="model">res.country</field>
<field name="arch" type="xml">
<search>
<field name="name" />
<filter
string="Archived"
name="inactive"
domain="[('active', '=', False)]"
/>
</search>
</field>
</record>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

В 17.0 уже есть вьюха для поиска. odoo/odoo#106372
Надо сделать на основе основе ее.

Comment on lines 7 to 10
def _merge(self, partner_ids, dst_partner=None, extra_checks=True):
if self.env.user.has_group("account.group_account_user"):
extra_checks = False
return super()._merge(partner_ids, dst_partner, extra_checks)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Изначально в этот модуль в 14.0 вводилась возможность бухгалтерам с правами account.group_account_user сливать партнеров с разными записями account.move и account.move.line, поскольку основной метод _merge не позволял это делать.

Но после коммита odoo/odoo@0148f19 оригинальный _merge уже позволяет это делать.

Соотвественно предлагаю метод удалить целиком и вместо него оставить это:

# removed since
# https://github.com/odoo/odoo/commit/0148f19f67f8725ae9bea7c208f09b4676652cc0

* `Eugene Molotov <https://github.com/em230418>`__

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Предлагаю себя тоже сюда добавить


* Allows to set country as archived

* Allows accountant without admin previledges to merge contacts with existing journal entries
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Comment on lines 5 to 11
* Allows to set country as archived

* Allows accountant without admin previledges to merge contacts with existing journal entries

Credits
=======

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Я предложил удалить только строку "* Allows accountant without admin previledges to merge contacts with existing journal entries". Остальное надо вернуть

Copy link
Member

@em230418 em230418 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Хорошая работа. В сообщении последнего коммита оставь только заголовок и я залью.
2024-09-19_13-29

@em230418 em230418 merged commit 12fd1bd into it-projects-llc:17.0 Sep 19, 2024
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants