[15.0][MIG] hr_timesheet_activity_begin_end

[CRogos]

contains changes of #507 and depends on hr_timesheet_sheet

[CRogos]

@schhatbar-initos @bosd could you have a look at this? You were involved in the v14 migration.

[manuelcalerosolis]

Trying to download the module gives me this error.

Auto-merging setup/_metapackage/setup.py507)
CONFLICT (content): Merge conflict in setup/_metapackage/setup.py
Automatic merge failed; fix conflicts and then commit the result.

setup/_metapackage/setup.py

install_requires=[
    'odoo-addon-hr_timesheet_task_domain>=15.0dev,<15.1dev',
    'odoo-addon-hr_timesheet_task_required>=15.0dev,<15.1dev',
    'odoo14-addon-hr_timesheet_activity_begin_end',
    'odoo14-addon-hr_timesheet_begin_end',
    'odoo14-addon-hr_timesheet_analysis',
    'odoo14-addon-hr_timesheet_sheet_begin_end',
],
classifiers=[
    'Programming Language :: Python',

[CRogos]

I have rebased the branch, please try again.

[manuelcalerosolis]

Now is ok!

Thanks

[CRogos]

I've rebased and implemented the split/rename of hr_timesheet_activity_begin_end in hr_timesheet_begin_end and hr_timesheet_sheet_begin_end.

  graph TD;
subgraph Active
      A["hr_timesheet"]
      
      A-->B["hr_timesheet_begin_end"];
      A-->C["hr_timesheet_sheet"];
      C-->D["hr_timesheet_sheet_begin_end"];
      B-->D;
end
      subgraph Depricated
          D-->E["hr_timesheet_activity_begin_end"];
      end

Loading

[nimarosa]

/ocabot migration hr_timesheet_activity_begin_end

[OCA-git-bot]

This PR has the approved label and has been created more than 5 days ago. It should therefore be ready to merge by a maintainer (or a PSC member if the concerned addon has no declared maintainer). 🤖

[OCA-git-bot]

On my way to merge this fine PR!
Prepared branch 15.0-ocabot-merge-pr-517-by-nimarosa-bump-nobump, awaiting test results.

[sbidoul]

A technical remark, raised by the bot monitoring.

[nimarosa]

@CRogos please make the changes suggested by @sbidoul so we can try the merge again

[CRogos]

Ok I think I've fixed the links. Is my change causing now the build error? From the logs I assume a github connection issue?

[sbidoul]

All green now, thanks. Please retry the merge

Issue resolved

[OCA-git-bot]

This PR has the approved label and has been created more than 5 days ago. It should therefore be ready to merge by a maintainer (or a PSC member if the concerned addon has no declared maintainer). 🤖

[nimarosa]

/ocabot merge nobump

[OCA-git-bot]

What a great day to merge this nice PR. Let's do it!
Prepared branch 15.0-ocabot-merge-pr-517-by-nimarosa-bump-nobump, awaiting test results.

[OCA-git-bot]

Congratulations, your PR was merged at 85519d6. Thanks a lot for contributing to OCA. ❤️

[EmilioPascual]

I have just added rename module to apriory in openupgrade OCA/OpenUpgrade#4340